summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19207-412/+420
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * 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
* | | Keyword name changeIan Walters2009-06-184-4/+4
| | | | | | | | | | | | | | | Behaviour was renamed Behavior. Was Australian spelling, now US spelling.
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-06-1713-27/+52
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Some XmlListModel cleanup.Michael Brasser2009-06-122-2/+2
| | | |
| * | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-101-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| | * | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-092-12/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| | * | 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 'kinetic-declarativeui' of ↵Michael Brasser2009-06-043-1/+6
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-043-1/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| | | * | 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
| * | | | Only run loading animation when visible.Michael Brasser2009-06-041-1/+1
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-272-7/+22
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | fix flickr demo after recent changes to gradients.Lars Knoll2009-05-271-2/+2
| | | | |
| | * | | Better gradient support for Rect.Martin Jones2009-05-272-7/+22
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-272-3/+18
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| | * | 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 'qt/master'Samuel Rødal2009-05-131-1/+1
| | |\ \ \ \
| | * | | | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-9/+9
| | | | | | |
* | | | | | | fade text accross white to blackIan Walters2009-05-261-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, when the highlight moved the text would blink from white to black. This was a little disconcerting. Add in a smooth blend for the color change.
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-259-39/+44
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-223-11/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| | * | | | | 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
| * | | | Add status and feedback info to XmlListModelMartin Jones2009-05-201-0/+2
| | | | |
| * | | | better focus handling for the location barLars Knoll2009-05-191-4/+1
| | | | |
| * | | | make the web browser URL field work a little betterLars Knoll2009-05-191-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The return key still doesn't do what it should do, but that's partly the fault of the KeyProxy's QML definition not working correctly.
| * | | | More precise positioning to leave 1-pixel inner marginWarwick Allison2009-05-192-7/+7
| | | | |
generated by cgit v0.12 at 2024-10-25 19:28:16 (GMT)