summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Disabled activeqt/webbrowser example from mingw build.Simo Fält2011-09-231-0/+3
|
* Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-065-2/+19
| | | | | Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-292-4/+2
|\ | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-238-15/+15
| |\
| * | Fix bad merge on a couple of xml examplesMiikka Heikkinen2011-08-052-4/+2
| | | | | | | | | | | | Reviewed-by: mread
* | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-267-13/+13
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-191-7/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
| | * | Doc: Fixes to Qt tutorialGeir Vattekar2011-07-291-7/+7
| | |/ | | | | | | | | | Reviewed-by: Jerome Pasion
| * | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-186-6/+6
| |\ \
| | * | Fix files that don't end with a newline characterSergio Ahumada2011-08-126-6/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-181-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| | * Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Somehow, the latin-1 multiply symbol was used instead of an 'x' in hex literals. Task-number: QTBUG-15716 Reviewed-by: mread
| | * Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-07-0114-241/+241
| | | | | | | | | | | | | | | | | | Fixed license text in files having old license. Reviewed-by: Trust Me
* | | examples: fix compilation with namespaced Qt.hjk2011-08-158-6/+12
|/ /
* | Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
| | | | | | | | Reviewed-by: Donald Carr
* | Removed files with 3rd party copyright notices.Jerome Pasion2011-07-118-3549/+81
| | | | | | | | | | | | HTML files not necessary for the HTML Info example. Reviewed-by: David Boddie <david.boddie@nokia.com>
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-07-081-0/+1
|\ \ | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits) Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. Hack SystemTimeWin.cpp to build on MSVC2005. Make Float32Array and Int16Array build on RVCT 2.x. ...
| | * \ Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-221920-1548/+68125
| | |\ \
| | * | | Fix build of Fancy Browser demo.Alexis Menard2011-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
* | | | | Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.David Boddie2011-07-043-1/+6
|/ / / /
* | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2766-1133/+1133
| | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | | | 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
generated by cgit v0.12 at 2024-12-29 09:14:40 (GMT)