summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-014-59/+67
|\
| * Fix a window opacity bug with DirectFBAnders Bakken2009-10-012-52/+60
| | | | | | | | | | | | | | | | | | Initialize IDirectFBWindows with the correct capabilities/options when supporting top level transparency. Also, properly deal with runtime changes of top level transparency. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Make sure gccaps is properly initialized for dfbpeAnders Bakken2009-10-011-0/+2
| | | | | | | | Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Clean up releaseSurface in QDirectFBPaintDeviceAnders Bakken2009-10-012-7/+5
| | | | | | | | | | | | | | | | Instead of having to call unlockSurface/releaseSubSurface and releaseSurface to release the surface in QDirectFBWindowSurface make releaseSurface do all three things. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Make QGLFramebufferObject crash-proof if QGLContext destroyed firstRhys Weatherley2009-10-013-26/+67
|/ | | | | | | | | | | | | | | | Sometimes it isn't possible to arrange for the QGLFramebufferObject to be destroyed before the QGLContext group in which it was created. Especially during application shutdown or in applications with multiple shared contexts. This change modifies QGLFramebufferObject to use QGLSharedResourceGuard, which ensures that when the last QGLContext in a sharing group is destroyed, any remaining FBO's will revert to !isValid(). It is now safe to destroy the context before the FBO, or the FBO before the context. Unit test included. Reviewed-by: Sarah Smith
* Stabilize tests on X11Olivier Goffart2009-09-304-37/+45
|
* Simplify code of states exampleThierry Bastian2009-09-301-42/+40
| | | | We're not using QGraphicsWidget any more
* Avoid warnings in the states exampleThierry Bastian2009-09-301-72/+63
| | | | We now have the animations directly added to the transition
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-301-4/+11
|\
| * Fix locale encoding in XLIFF filesAndy Shaw2009-09-301-4/+11
| | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi
* | Revert "Make the test fail, not crash for now. A task is already open to fix ↵Peter Hartmann2009-09-301-2/+1
| | | | | | | | | | | | | | | | | | | | it." This reverts commit 21cfe5bf6550ae359d6bfa937b1308891954e9bb. The bug is fixed now. Reviewed-By: Alexis
* | optimize read() and readAll()Oswald Buddenhagen2009-09-301-20/+24
| | | | | | | | | | | | | | | | factor out a dedicated private::read() function based on private::scan(). this avoids making the latter even more complex in the process of optimizing it. Reviewed-By: mariusSO
* | optimize scan()Oswald Buddenhagen2009-09-301-2/+1
| | | | | | | | | | | | lastChar needs to be set only when in line mode Reviewed-By: mariusSO
* | improve condition nestingOswald Buddenhagen2009-09-301-11/+23
| | | | | | | | | | | | | | compilers might or might not have been clever enough to optimize it. better safe than sorry. Reviewed-By: mariusSO
* | Cleaning up usage of examples/{examplebase,symbianpkgrules}.priJoão Abecasis2009-09-3017-35/+1
| | | | | | | | | | | | | | | | | | | | examplebase.pri was renamed to symbianpkgrules, but some project files were not updated to reflect the change. Since it doesn't make sense to have this in non-portable examples, the include is removed in those cases. Reviewed-by: Espen Riskedal
* | QDom: set the codec to UTF-8 if codec not present or unknownPeter Hartmann2009-09-301-8/+9
| | | | | | | | | | | | | | | | we were trying to get a codec even for unknown names. Now, we always set the codec to UTF8 if the field is not present or we do not know the codec. Reviewed-by: Paul
* | Google Chat example: always bail out if SSL not availablePeter Hartmann2009-09-301-5/+5
| | | | | | | | Reviewed-by: Simon Hausmann
* | Revert "Google Chat example: state that SSL is required"Peter Hartmann2009-09-301-15/+0
| | | | | | | | | | | | | | This reverts commit 59623e45ee31892c9ef210f8d7e396ccb0fe31a5. A fix for the same problem had been pushed by Simon shortly before that one.
* | Doc: Remaining pieces of the Graphics effect documentation.Bjørn Erik Nilsen2009-09-302-0/+34
| |
* | Added QGraphicsBloomEffect::blurHint.Bjørn Erik Nilsen2009-09-302-0/+38
| | | | | | | | | | | | | | This allows the user to control whether to use a fast dynamic blur or a static high quality blur. Reviewed-by: Samuel
* | Add Qt::RenderHint to control rendering operations.Bjørn Erik Nilsen2009-09-307-54/+50
| | | | | | | | | | | | | | | | | | | | | | We need a way to control various rendering operations. For example, whether quality is more important than performance, or the other way around. This change also replaces occurences of QPixmapFilter/QGraphicsEffect::BlurHint (introduced in 1a431e850893b6b162c833f4f148f090e2427dda) with Qt::RenderHint. Reviewed-by: Samuel
* | Readd QGraphicsBloomEffect.Bjørn Erik Nilsen2009-09-305-0/+224
| | | | | | | | | | | | | | | | This effect was removed in 1c9a28ea64cc53e61a64644dc5a4ff121b475bc5, but has now been readded on request from a couple of customers. Andreas also agreed we should provide this effect. Reviewed-by: Andreas
* | Compilation fix for tests thas doesn't include qapplication.hOlivier Goffart2009-09-301-1/+1
| |
* | Make sure to process the events in QTest::qWaitForWindowShown on X11Olivier Goffart2009-09-301-0/+1
| | | | | | | | | | | | qt_x11_wait_for_window_manager doesn't necesserly process the events Reviewed-by: Denis
* | Make it possible to debug JSC in the Symbian emulator.Janne Koskinen2009-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | Cherry-picked-by: Simon Hausmann http://trac.webkit.org/changeset/48928 This is not a perfect fix, it requires more fine tuning. But this makes it possible again to debug in the emulator, which is more important in order to be able to fix other run-time issues.
* | Merge branch 'focusFixes' into 4.6axis2009-09-309-74/+80
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp
| * | Fixed some focus issues on Symbian.axis2009-09-303-18/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are really two bugs that are fixed in this commit: - SetFocus() in Symbian does not automatically clear focus on the previously focused control, so we have to remember that control and clear it ourselves. - Symbian assumes that it is always the control at the top of the control stack that should have focus, and if this isn't the case, focus may or may not work depending on whether Symbian has had a chance to reset the focus or not. Therefore, whenever we change focus on a control, we have to also readd that control to the top of the stack, to ensure that it stays focused. RevBy: Janne Anttila
| * | Fixed some uncommon codepaths to compile.axis2009-09-301-2/+2
| | | | | | | | | | | | RevBy: Trust me
| * | Avoided qt3support constructor (S60 port doesn't have it).axis2009-09-301-1/+1
| | | | | | | | | | | | RevBy: Paul Olav Tvete
| * | Helped out the Symbian compiler to avoid build error.axis2009-09-301-4/+4
| | | | | | | | | | | | RevBy: Trust me
| * | Revert "Switched to asynchronous focus handling on Symbian."axis2009-09-307-52/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6377f43410b14125a66ffd02acde69cfb6e455e. The asynchronous handling caused too many headaches with input methods, which expect the focus status to be updated immediately. This may break the test case that was originally fixed by this patch (I cannot find out which one at the moment), but that will have to be solved in a different way. Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp
* | | Moving some QVFB stuff out of the configure script and into .pro filesJoão Abecasis2009-09-303-21/+12
| | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
* | | Stabilize more test on X11Olivier Goffart2009-09-306-110/+108
| | | | | | | | | | | | Each times the test are run, pulse show different failures.
* | | Prospective solaris-g++-sparc build fixSimon Hausmann2009-09-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g++ on sparc appears to have problems inlining functions when Qt is compiled in debug. ("sorry: unimplemented blah blah") We're not entirely sure, but we suspect that removing -g might help avoid this compiler bug. Reviewed-by: Kent Hansen
* | | Add more debug information to the QPrinterInfo testOlivier Goffart2009-09-301-8/+11
| | | | | | | | | | | | Reviewed-by: Paul
* | | Stabilize graphicsview testOlivier Goffart2009-09-301-1/+3
| | |
* | | Fix regression in Command link button font sizeJens Bache-Wiig2009-09-092-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since vista style polish sets the font on polish, the check for WA_SetFont will succeed, hence we never set the actual font. I replaced the check with a full resolve. However since the resolve would clear the resolve_mask, from the widget font it has to be restored manually so that QPainter:setFont can resolve it later. Task-number: QTBUG-4646 Reviewed-by: trond
* | | Fix duplicate key events from extended media keys on WindowsJens Bache-Wiig2009-09-091-61/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We handle WM_APPCOMMAND to generate keyEvents separate from normal key events. However when we already have virtual key mappings for the same keys the events got delivered twice. Hence we have now removed WM_APPCOMMAND handling for all such keys. Task-number: QTBUG-4124 Reviewed-by: prasanth
* | | Make itemviews use gradient selection on Vista by defaultJens Bache-Wiig2009-09-092-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We postponed this in 4.3 when the vista style was introduced since a lot of microsoft apps still used the legacy style and microsoft did not enable it by default. It has been reported as bugs a few times and it seems increasingly odd that we are not using the more modern look and feel when we can. Instead of only enabling it for QTreeView, we now only disable it for QTableView as the look still cannot be used to span vertical cells. Task-number: QTBUG-3746 Reviewed-by: prasanth
* | | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-09-30127-1085/+19190
|\ \ \
| * \ \ Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-3014-46/+212
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Martin Smith2009-09-303-1/+31
| | |\ \ \
| | | * | | Google Chat example: state that SSL is requiredPeter Hartmann2009-09-301-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bail out if SSL is not supported; before it only showed "service unavailable", which was somewhat confusing. Reviewed-by: Tor Arne Vestbø
| | | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-302-1/+16
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp src/3rdparty/webkit/WebCore/generated/CSSGrammar.h (merged webkit files with -s ours)
| | | | * | Fix reader.google.com crashesSimon Hausmann2009-09-303-1450/+1133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert this change: ---- 2008-12-18 Bernhard Rosenkraenzer <bero@arklinux.ch> Reviewed by Darin Adler. https://bugs.webkit.org/show_bug.cgi?id=22205 Fix compatibility with bison 2.4, partially based on older patch by Priit Laes <amd@store20.com> * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4 ----- Cherry-picked from qtwebkit.git 4.5 repository/branch with commit 23d13ba45ee59379c04afdef8472acc8611bb36a
| | | | * | (TDS) Fixes improper formatting of date valuesBill King2009-09-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-754
| | | | * | (TDS) Fixes missing field/table name escaping.Bill King2009-09-302-0/+13
| | | | | |
| | * | | | qdoc: Modified the support for \sincelist.Martin Smith2009-09-305-42/+141
| | |/ / / | | | | | | | | | | | | | | | It now finds a lot more \since 4.6 stuff.
| | * | | Don't need to wait that much.Alexis Menard2009-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | * | | Be consistant between static method and regular QFileDialog contructor.Alexis Menard2009-09-302-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The protected constructor of QFileDialog call selectAll() on the line edit. This constructor is only called by static methods. But the regular constructor didn't behave the same. Now it does :D. Task-number:QTBUG-4419 Reviewed-by:jasplin