summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge license header changes from 4.5Volker Hilsheimer2009-06-16204-406/+406
|\
| * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-162-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16206-410/+410
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-125-6/+14
|\ \ | |/ | | | | | | | | | | | | | | | | 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 a compile failure on Solaris, really :)Trond Kjernåsen2009-06-101-9/+9
| | | | | | | | | | | | You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
| * 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
| * BT: Fix the installed browser source tree to compile.Thomas Zander2009-06-091-1/+1
| |
| * BT: Make the spreadsheet demo install its header files so it will compile ↵Thomas Zander2009-06-091-1/+1
| | | | | | | | after installing
| * Fixed a compile issue on Solaris.Trond Kjernåsen2009-06-091-10/+10
| | | | | | | | | | | | GLchar is defined to be unsigned on Solaris for some reason. Reviewed-by: Tom
* | Removed background caching in embeddeddialogs demo.Samuel Rødal2009-06-091-1/+0
| | | | | | | | | | | | | | | | No point in caching a background that is already a pixmap. When maximizing the window this pixmap gets huge, and it doesn't help performance either. Reviewed-by: Trond
* | 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
* | compile fix with namespaceshjk2009-06-042-0/+5
| |
* | Improvements to shader API in response to API reviewRhys Weatherley2009-06-041-1/+1
| | | | | | | | | | Task-number: QT-80 Reviewed-by: Ian Walters
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-3/+3
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * BT: opening datetimepicker in a cell in spreadsheet demo resets the dateOlivier Goffart2009-05-261-3/+3
| | | | | | | | | | | | That was a bug in the exemple. Reviewed-by: Kavindra Palaraja
* | Merge branch 'master' into graphics-masterTom Cooksey2009-05-251-0/+15
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-228-72/+80
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | add animation and state machine examples to qtdemoKent Hansen2009-05-201-0/+15
| | | |
* | | | Merge commit 'qt/master'Samuel Rødal2009-05-203-11/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| | * | Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | |/ | | | | | | | | | Reviewed-by: Lincoln Ramsay
| * | Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-151-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleOptionGraphicsItem extends QStyleOption with three values: 1) matrix, 2) levelOfDetail, 3) exposedRect, and they all involve expensive QTranform operations when calculated. We pass style option(s) to drawItems() and paint(), but the extended values are usually not in use. We can therefore gain quite some nice speedup by making them opt-in with the QGraphicsItem::ItemUsesExtendedStyleOption flag. Additionally, QStyleOptionGraphicsItem::levelOfDetail has been obsoleted, and a new function QStyleOptionGraphicsItem:: levelOfDetailFromTransform(const QTransform &) has been added. Me and Andreas don't consider this change to be too controversial even though it changes the behavior. Auto tests still pass. Reviewed-by: Andreas
* | | Merge commit 'qt/master'Samuel Rødal2009-05-131-1/+1
|\ \ \ | |/ /
| * | Fix typo in spreadsheet exampleThomas Zander2009-05-121-1/+1
| | | | | | | | | | | | Reviewed-by: Kavindra Palaraja
* | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-9/+9
| | |
* | | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | | | | | Patch originally by Ian Walters.
* | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-3/+3
| | | | | | | | | | | | | | | | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
* | | Merge branch 'shaderprograms' of ↵Rhys Weatherley2009-05-017-550/+61
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api Conflicts: src/gui/math3d/math3d.pri src/gui/math3d/qgenericmatrix.cpp src/gui/math3d/qgenericmatrix.h src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h src/gui/math3d/qquaternion.cpp src/gui/math3d/qquaternion.h src/gui/math3d/qvector2d.cpp src/gui/math3d/qvector2d.h src/gui/math3d/qvector3d.cpp src/gui/math3d/qvector3d.h src/gui/math3d/qvector4d.cpp src/gui/math3d/qvector4d.h src/opengl/opengl.pro tests/auto/math3d/math3d.pro tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp tests/auto/math3d/qquaternion/tst_qquaternion.cpp tests/auto/math3d/qvectornd/tst_qvectornd.cpp tests/auto/math3d/shared/math3dincludes.h
| * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-237-550/+61
| | |
* | | 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
| | |
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+1
|\ \ \ | | |/ | |/|
| * | Add Google Suggest as a new network exampleAriya Hidayat2009-04-231-0/+1
| | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | Merge branch '4.5'Thiago Macieira2009-04-231-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * | Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-231-0/+1
| | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+5
|\ \ \ | |/ /
| * | 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
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * | 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
* | | Merge commit 'origin/4.5'Olivier Goffart2009-04-153-4/+15
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | BT: Fix the embedded dialogs demo on Mac OS X and Motif styleAndreas Aardal Hanssen2009-04-082-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CustomProxy class installs an event filter on its child to detect whether it is shadowed by a popup or not. The problem is it does this regardless of whether it currently has a scene assigned or not. Styles that assign palettes, or otherwise cause side effects when assigned to a QGraphicsProxyWidget, will cause the demo to print warnings to the console and fail to install the event filter. The reason for the failure to install the filter is that QGraphicsItem only allows scene event filters to be installed between items that are in the same scene. So, depending on the style, you either get an ItemSceneHasChanged or an ItemChildAddedChange first. The demo must account for this, and install its filter only when the items are guaranteed to be in the scene already. Reviewed-by: Alexis
| * | Revert "Bt: Fix regression in the Embedded dialogs example"Andreas Aardal Hanssen2009-04-081-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b. The change to QComboBox introduces a behavior change; whereas before the view container would always get its palette set as a response to QEvent::PaletteChange, it would now miss this event and rely on regular palette propagation to get the right contens. The difference in behavior is that QWidget::setPalette() also resolves the palette mask, and after 35c26d69 this would no longer happen. The bug in the embedded dialogs demo is caused by the embedded dialogs demo. See upcoming commit. Reviewed-by: Alexis Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| * | BT: Revert "Fixes: Remove warnings in the embeddeddialogs demo."Andreas Aardal Hanssen2009-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7d24c0af8e52687b4e5735950495bb25947ca9f0. This change removed the accidental recursion leading to console warnings on Mac OS X by changing the way the scene event filter is registered for popups. But it also broke the behavior of the demo with regards to popup handling, in that the custom proxy no longer can detect popups that close, so dialogs stay zoomed in after the cursor has left. So before, the demo worked but printed warnings to the console on Mac OS X, and after, the warnings were gone but the demo behavior broke on all platforms... The change also accidentally removed the cache mode from the popup; I don't think this was intentional. Reviewed-by: Alexis
generated by cgit v0.12 at 2024-09-28 01:20:04 (GMT)