summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-2858-316/+1816
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-243-12/+40
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-233-12/+40
| | |\
| | | * Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | | * Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | | * GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | | * GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-0/+15
| | | * Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-2413-10/+109
| |\ \ \
| | * | | Fix warning about copy constructor not initialising base explicitlyThiago Macieira2011-03-221-0/+1
| | * | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-2265-329/+1937
| | |\ \ \
| | * | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-2112-9/+109
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-224-11/+32
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-224-11/+32
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-222-6/+7
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-211-1/+1
| | |\ \ \
| | | * | | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-5/+6
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-211-5/+6
| * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-224-13/+33
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-194-13/+33
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-194-13/+33
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| * | | | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-2138-121/+403
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'merge_raster'Fabien Freling2011-03-1714-145/+338
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'raster/master' into merge_rasterFabien Freling2011-03-1714-145/+338
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add an overloading function to flush().Fabien Freling2011-03-162-0/+9
| | | * | | | | | | Remove the check on flushRequested.Fabien Freling2011-03-161-1/+1
| | | * | | | | | | Merge remote branch 'mainline/master' into merge_rasterFabien Freling2011-03-15165-386/+3876
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Change the way the unified toolbar is flushed.Fabien Freling2011-03-155-37/+50
| | | * | | | | | | | Add the ability to remove a toolbar from the unified toolbar.Fabien Freling2011-02-253-4/+33
| | | * | | | | | | | Move the Mac specific behavior in #ifdef.Fabien Freling2011-02-231-1/+14
| | | * | | | | | | | Remove useless variable.Fabien Freling2011-02-232-2/+0
| | | * | | | | | | | Merge remote branch 'mainline/master' into merge_rasterFabien Freling2011-02-231175-3157/+4660
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Optimize the rendering path for the unified toolbar.Fabien Freling2011-02-155-18/+47
| | | * | | | | | | | | Remove useless statements.Fabien Freling2011-02-142-4/+0
| | | * | | | | | | | | Force the repaint during live resize.Fabien Freling2011-02-081-0/+5
| | | * | | | | | | | | Remove useless function.Fabien Freling2011-02-082-6/+0
| | | * | | | | | | | | Remove useless variables.Fabien Freling2011-01-311-3/+0
| | | * | | | | | | | | Disable subtractOpaqueSiblings when in the unified toolbar.Fabien Freling2011-01-281-1/+1
| | | * | | | | | | | | Move all display: utility functions.Fabien Freling2011-01-274-24/+23
| | | * | | | | | | | | Force the display: in the unified toolbar.Fabien Freling2011-01-271-1/+3
| | | * | | | | | | | | Remove useless displayIfNeeded: definition.Fabien Freling2011-01-261-16/+0
| | | * | | | | | | | | Change variable name.Fabien Freling2011-01-263-3/+3
| | | * | | | | | | | | Move the flushing to [view drawRect:rect]Fabien Freling2011-01-267-98/+153
| | | * | | | | | | | | Small typo fix.Fabien Freling2011-01-251-1/+1
| | | * | | | | | | | | Merge branch 'unified-toolbar'Fabien Freling2011-01-251-1/+12
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Free memory when disabling the unified toolbar.Fabien Freling2011-01-141-1/+12
| | | * | | | | | | | | | Add utility functions for using Core Graphics contexts.Fabien Freling2011-01-251-0/+28