summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * Merge branch 'kinetic-transform' of git@scm.dev.nokia.troll.no:qt/kineticRhys Weatherley2009-08-201-1/+1
| |\
| | * Fix sub-attaq after the QGraphicsTransform changesRhys Weatherley2009-08-201-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
* | | Merge commit 'qt/master'Jason Barron2009-08-203-1/+45
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | QNAM HTTP: New attribute, Demo browser: Some request statistic outputMarkus Goetz2009-08-202-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | New output that tells if a QNetworkReply was retrieved by using HTTP pipelining. The demo browser now shows some (debug) output about usage of cache, pipelining and SSL. Reviewed-by: Prasanth
| * | QNAM HTTP PipeliningMarkus Goetz2009-08-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Pipelining should improve the performance of HTTP requests for high latency network links. Since some servers/proxies could have problems with it, it is disabled by default. Set the HttpPipeliningAllowed attribute of a QNetworkRequest to enable it for that request. Reviewed-by: Thiago
| * | Make the license test pass.Frans Englich2009-08-191-0/+2
| |/ | | | | | | | | | | | | This is partly done to address a review comment for S60. Reviewed-by: Marius SO Reviewed-by: Paul
* | Preload the tiles for the zoomed out version of the map.Ariya Hidayat2009-08-191-0/+4
| | | | | | | | | | | | | | | | | | This eats more network, but helps to avoid the impression that the magnifying glass does not work. (This is cherry-picked from Graphics Dojo fix). Reviewed-by: TrustMe
* | Import flipping (digital) clock demo.Ariya Hidayat2009-08-195-1/+428
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/15/digital-clock-in-a-phone/ Reviewed-by: Jason Barron
* | Import the flick list (kinetic scrolling) example.Ariya Hidayat2009-08-197-1/+601
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/19/kinetic-scrolling-on-any-widgets/ Reviewed-by: Jason Barron
* | Import the weather info example.Ariya Hidayat2009-08-1919-0/+30023
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/22/weather-info-for-qts60/ Reviewed-by: Jason Barron
* | Import the flight info example.Ariya Hidayat2009-08-198-0/+660
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/07/26/track-your-flight-with-qts60/ Reviewed-by: Jason Barron
* | Import OpenStreetMap example.Ariya Hidayat2009-08-195-0/+590
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/08/04/openstreetmap-and-qt-and-s60/ Reviewed-by: Jason Barron
* | Let's build the ray casting demo.Ariya Hidayat2009-08-191-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Import the raycasting demo.Ariya Hidayat2009-08-196-0/+319
| | | | | | | | | | | | | | Originally it was published in Qt Labs: http://labs.trolltech.com/blogs/2009/08/09/ray-casting-on-qts60/ Reviewed-by: Jason Barron
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-192-74/+36
|\ \ | |/ | | | | | | Conflicts: tests/auto/auto.pro
| * Made the browser demo use the new QXmlStreamReader functionsThorbjørn Lindeijer2009-08-182-74/+36
| | | | | | | | Same as in the bookmarks example.
* | Changed names and URLs to reflect name change.axis2009-08-1927-31/+31
| | | | | | | | RevBy: Trust me
* | Merge commit 'qt/master'Jason Barron2009-08-183-3/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * Add qtbynokia Twitter account into demo browser bookmarksMarkus Goetz2009-08-171-0/+3
| | | | | | | | Reviewed-by: TrustMe
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| * Fix compiler warningPrasanth Ullattil2009-08-131-2/+4
| | | | | | | | | | | | We need to remove Zm200 from compiler flags before adding Zm1200 Reviewed-by: Marius Storm-Olsen
* | Merge commit 'qt/master'Jason Barron2009-08-13232-572/+582
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * QGraphicsRotation and QGraphicsRotation3D are now merged into 1 classThierry Bastian2009-08-123-6/+5
| | | | | | | | | | | | | | | | You can now also set the axis following hte Qt::Axis enum Note: I'm not 100% sure about the maths in QGraphicsRotation::applyTo Feel free to fix it. Reviewed-by: ogoffart
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-127-307/+303
| | | | | | | | Reviewed-by: Trust Me
| * Update obsolete URL's in code and docs.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update references to online documentation.Jason McDonald2009-08-121-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Update URL's to use new domain.Jason McDonald2009-08-123-3/+3
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-12230-230/+230
| | | | | | | | Reviewed-by: Trust Me
| * Introducing icon theme supportJens Bache-Wiig2009-08-101-25/+40
| | | | | | | | | | | | | | | | | | | | | | | | Added some static functions to QIcon to support desktop themes based on the freedesktop spec. It is not intended to replace KIcon and the intention is to use it when available to share icon cache between applications. Applications currently using icon themes are Assistant, Designer and the textedit demo. Reviewed-by: ogoffart
* | Merge commit 'qt/master-stable'Jason Barron2009-08-101-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * Doc: Integrated the Rogue (state machine) example.Geir Vattekar2009-08-071-0/+1
| | | | | | | | Reviewed-by: Kent Hansen
* | Update license headers according to commit 858c70f768e.axis2009-08-0626-52/+52
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-067-7/+7
| | | | | | | | RevBy: Trust me
* | Converted file from dos to unix linefeeds.Simon Hausmann2009-08-061-12/+12
| |
* | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+5
| |
* | Merge commit 'origin/master'Jason Barron2009-08-067-8/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | 'Trailing whitespace' and 'blank line' fixes for demos and examplesJanne Anttila2009-08-047-8/+2
| | |
* | | Merge commit 'origin/master'Jason Barron2009-08-0416-253/+278
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Fixed some Qt coding style deviations for desktopservices demoJanne Anttila2009-08-042-14/+14
| | |
| * | Trailing whitespace and tab/space fixes for demos/embeddedJanne Anttila2009-08-0413-96/+93
| | |
| * | Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+3
| | |
| * | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
| * | Updated style demo to adjust spinbox value when sliders are moved.Janne Anttila2009-07-241-144/+161
| | | | | | | | | | | | Task: 258515: StyleDemo: Moving sliders do not update spinbox
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-044-4/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Fix compilation and warningAlexis Menard2009-08-032-3/+5
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Add XML schema example to qtdemoPeter Hartmann2009-07-291-0/+1
| | | | | | | | | | | | Reviewed-by: Frans Englich
| * | Fix compilation errors in examples and demos on VxWorks and QNX.Robert Griebl2009-07-291-2/+3
| | | | | | | | | | | | Reviewed-by: Harald Fernengel
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-3073-2/+6560
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h