summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
* | | | | | 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
| | | |
* | | | Simplify (hopefully) anchors, and make them less reliant on signalsAaron Kennedy2009-05-181-1/+0
| | | |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Warwick Allison2009-05-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsscene.cpp
| * | | Fix typo in spreadsheet exampleThomas Zander2009-05-121-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Kavindra Palaraja
* | | | Flickr demo: Scale the image about the center of the visible area.Martin Jones2009-05-141-2/+17
| | | |
* | | | Make good television.Warwick Allison2009-05-121-2/+2
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-121-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Revert accidentally commted stuff.Warwick Allison2009-05-121-21/+0
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-121-1/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix resizing and skinning.Warwick Allison2009-05-111-1/+24
| | | | | | | | | | | | | | | | | | | | Broke with mainwindow introduction.
* | | | | Make scaling in flickr demo sensible.Martin Jones2009-05-123-16/+29
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-114-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix webbrowser demoYann Bodson2009-05-113-3/+9
| | | | |
| * | | | Change pathview angle.Yann Bodson2009-05-111-1/+1
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-082-52/+47
|\ \ \ \ \ | |/ / / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Add tags to flickr2Yann Bodson2009-05-081-5/+14
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-05-088-34/+201
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Fix flickr2Yann Bodson2009-05-082-49/+35
| | | | | |
* | | | | | highlight in tune with background imageWarwick Allison2009-05-081-0/+1
| |/ / / / |/| | | |
* | | | | Fade TagEdit properlyWarwick Allison2009-05-081-0/+1
| | | | |
* | | | | Minimal size is MediaButton size, center outside edit modeWarwick Allison2009-05-081-10/+8
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-088-102/+133
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-081-71/+58
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Get the delegate scale correct at the ends of the path.Martin Jones2009-05-081-5/+4
| | | | | |
generated by cgit v0.12 at 2024-11-26 17:28:30 (GMT)