summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \
| * | | 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 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
* | | | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-19033
* | | | 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
| | * | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Fixed example project file for Symbian.David Boddie2011-02-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15716
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0411-6/+262
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-241-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code Update the data files for the QString benchmark test Fix a bug in the SSE2 UTF-8 decoder. Add ARM Neon versions of fromLatin1 and fromUtf8 Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE) Add baselines and zeros to the benchmarks. Add an UTF-8 conversion on trusted data and no BOM. Make it easier to write a UTF-8 conversion on trusted data Add the missing tests and 4-byte UTF-8 sequences Improve the code and avoid unnecessary stores Add an UTF-8 conversion optimised for ASCII using SSE2 Add an UTF-8 conversion code that is optimised for ASCII Add a stateless copy of the Qt 4.7 UTF-8 codec. Add UTF-8 code benchmarks Improve a little more the core loop and propagate to the other code Reduce the number of operations in the main loop Add an SSE4 version using PMOVZXBW and PSRLDQ Attempt to improve the epilog code ...
generated by cgit v0.12 at 2025-01-23 13:24:44 (GMT)