summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07277-3/+9488
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-04-061-2/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. qdoc: Allowed multiple values for certain metadata tags. qdoc: modified \include to take a 2nd arg, snippet id. Doc: Minor fix to title. Doc: Fixed markup. Doc: Added a missing command. Doc: Removed duplicate documentation. Removed some links and prettified others. Doc: Squashed commit of Roland Wolf's threading tutorial.
| | | * | | | Removed invalid public slots section.David Boddie2011-04-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9316
| | * | | | | Fixed license headers for examples in 4.7Timo Turunen2011-04-057-189/+182
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
| | * | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-03-296-0/+468
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16609
| | * | | | Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-23270-1/+9020
| | |\ \ \ \
| | | * | | | Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| | | | | | |
| | | * | | | Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| | | | | | |
| | | * | | | Fixed style issue and replaced image.Jerome Pasion2011-03-221-1/+1
| | | | | | |
| | | * | | | Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| | | | | | |
| | | * | | | Edited QtWebKit Guide.Jerome Pasion2011-03-211-0/+258
| | | | | | |
| | | * | | | Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| | | | | | |
| | | * | | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-151-7/+7
| | | | | | |
| | | * | | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1539-0/+3594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2214-153/+1033
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-0616-432/+416
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed license headers for examples in master
| | * | | | | | Fixed license headers for examples in masterTimo Turunen2011-04-0516-432/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3124-2/+974
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2213-151/+1024
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-2/+9
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc
| | * | | | | | Doc: Fixed memory leak in undo framework exampleGeir Vattekar2011-03-022-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15756
| | * | | | | | Doc: Added a threading tutorial.David Boddie2011-02-2420-1/+964
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit containing changes to documentation during the development of a threading tutorial, written by Roland Wolf.
| | * | | | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| | * \ \ \ \ \ \ Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativeview.cpp
| | | * \ \ \ \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-253-3/+4
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-171441-1452/+1454
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
generated by cgit v0.12 at 2025-04-15 05:04:30 (GMT)