summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
Commit message (Collapse)AuthorAgeFilesLines
* Added a version information to our executables.Denis Dzyubenko2009-07-151-0/+30
| | | | | | | | On Windows, the FileDescription part of the version information is used as a caption for the grouped taskbar button. Task-number: 253065 Reviewed-by: Prasanth Ullattil
* Merge license header changes from 4.5Volker Hilsheimer2009-06-1641-82/+82
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1641-82/+82
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-123-4/+12
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Fixed non-working animations under X11 with the raster graphicssystem.Trond Kjernåsen2009-06-101-1/+1
| | | | | | | | Reviewed-by: jbache
| * BT: QtDemo works far to sluggish on macRichard Moe Gustavsen2009-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Basically we need to revert more of Oliviers change. The reason is that we just cannot run the demo on mac without timer based updates (as opposed to graphics view itself tries to figure out when to update). The reason is that the demo uses QItemAnimations extensivelly, which again uses QTimelines, wich again uses separate timers. And on mac, because of coalesced updated, each item animation will result in an individual redrawing of the scene. Task-number: 255751 Reviewed-by: Olivier
| * BT: Fixes building qtdemo in the installed tree of sources.Thomas Zander2009-06-101-1/+3
| | | | | | | | | | | | | | The QT_BUILD_TREE variable only works in the source or build dir, but fails in the demo which *install* the sources that should be buildable too. Reviewed-by: Marius Storm-Olsen
| * BT: Fix missing animation in the Qt Demo BrowserJens Bache-Wiig2009-06-091-2/+6
| | | | | | | | | | | | | | | | Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183 prevents the animation from running on Windows. This is a partial revert that still preserves most of the performance fixes. Reviewed-by: ogoffart
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-042-12/+3
|\ \ | |/
| * BT: qt demo takes 100% of the cpu on X11Olivier Goffart2009-06-032-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tick timer is always active, even if the moving gree Qt logo is not visible. But the code that is supposed to pause it when the app loose the focus doesn't works if the moving Qt logo is not visible. Also the call to syncX makes Xorg takes lot of cpu. It doesn't fix the fact that the timer is still running while the green logo is not visible, but at least doesn't take the cpu anymore if qtdemo loose the focus. Task-number: 255020 Reviewed-by: Richard Moe Gustavsen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-223-40/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * | Fixed Compile after removal of D3D.Friedemann Kleint2009-04-283-8/+8
| | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | Remove the Direct3D engine.Gunnar Sletta2009-04-243-32/+2
| |/
* | add animation and state machine examples to qtdemoKent Hansen2009-05-201-0/+15
|/
* Add Google Suggest as a new network exampleAriya Hidayat2009-04-231-0/+1
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-231-0/+1
| | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add the fancybrowser to the examples in qtdemoSimon Hausmann2009-04-231-0/+1
| | | | Reviewed-by: Kavindra
* Add WebKit examples to the Qt DemoSimon Hausmann2009-04-231-0/+4
| | | | Reviewed-by: Kavindra
* BT: Mac: QtDemo is really sluggish when opening menusRichard Moe Gustavsen2009-04-162-3/+3
| | | | | | | | | | This has to do with coalesced updates. The easy fix for now is to fix QtDemo itself, meaning: always use a steady timer for redrawing the viewport of the graphics view (as opposed to let each item on screen calling update whenever they move) Task-number: 250667 Reviewed-by: Trenton Schulz
* Squashed commit of the following:David Boddie2009-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
* Long live Qt 4.5!Lars Knoll2009-03-2351-0/+6677