summaryrefslogtreecommitdiffstats
path: root/src
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-012-26/+39
|/ | | | | | | | | | | | | | | | 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
* 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
* 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
* 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-303-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-308-60/+75
|\ | | | | | | | | | | 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
| * Revert "Switched to asynchronous focus handling on Symbian."axis2009-09-306-43/+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
* | 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
* | 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-3072-399/+774
|\ \
| * \ 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
| | | |
| * | | Be consistant between static method and regular QFileDialog contructor.Alexis Menard2009-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-3011-19/+201
| |\ \ \
| | * | | avoid JavaScriptCore C API functions being exported from QtScript libraryKent Hansen2009-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | * | | Compile on VS2003Kent Hansen2009-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler complained about ambiguity in calls to make_pair because there is also a "using std::make_pair" in the WTF namespace (wtf/HashTraits.h). Reviewed-by: Simon Hausmann
| | * | | Compile.Eskil Abrahamsen Blomfeldt2009-09-301-0/+72
| | | | | | | | | | | | | | | | | | | | Missed qdatastream_p.h in last commit.
| | * | | Fix floating point precision when using qreal with QDataStreamEskil Abrahamsen Blomfeldt2009-09-303-9/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A frequent bug when using QDataStream across platforms where the size of qreal is different (such as any desktop platform and an ARM device) is that you end up using different overloads for streaming the value in and out (e.g. operator>>(double) on desktop and operator<<(float) on ARM.) This can leads to crashes and data corruption. To avoid the problem, we define a single floating point precision for the entire data stream and allow this to be set by the user. The default is to use 64-bit precision for all floating point numbers. Reviewed-by: Samuel Reviewed-by: Thiago
| | * | | Phonon/EffectFactory: Remove calls to QObject tr().Friedemann Kleint2009-09-301-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace them by calls to QCoreApplication::translate() to provide translators with context information. Reviewed-by: Frans Englich <frans.englich@nokia.com>
| | * | | Compile when one includes <QtGui/QtGui> without putting explicitly all Qt ↵Olivier Goffart2009-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | subdirs in the include path
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-09-308-22/+31
| | |\ \ \
| | | * | | Fix tst_QFontDialog::task256466_wrongStyle() autotest failure in Cocoa.Prasanth Ullattil2009-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fonts contain only styles other than Normal (or Regualr). If we try to retrive the font sizes for such fonts by passing an empty style string, the QFontDatabase will return a null list. This was causing the autotest to fail. This patch will make sure that a style is always selected in the QFontDialog. Reviewed-by: Olivier
| | | * | | Fixed warning in public header:Olivier Goffart2009-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcommonstyle.h:87: warning: virtual void QCommonStyle::polish(QPalette&) was hidden qs60style.h:77: warning: by QS60Style::polish Reviewed-by: Jeremy
| | * | | | Ftp example application crashes (due to keypad navigation)Sami Merilä2009-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keypad navigation tries to calculate the minimal distance of next widget to the direction of pressed navigation key. This calculation in QWidgetPrivate::widgetInNavigationDirection dies not take into account that some widgets might have focusProxy setup. In the reported case, ignoring focus proxy means that QDialogButtonBox gets the focus and it hands it over to first button in its tab order. Unfortunately, this button is disabled 'Download' button. Now, when Select key is pressed, button action is triggered causing a crash. Solution is to skip widgets that have focus proxies in widgetInNavigationDirection. Task-number: QT-2177 Reviewed-by: Alessandro Portale
| * | | | | Add redo keyboard shortcut for Symbian.Jani Hautakangas2009-09-301-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian had undo shortcut already defined so this will add redo shortcut to get symmetrical undo-redo Reviewed-by: axis
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-30111-441/+6860
| |\ \ \ \
| | * | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-09-303-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | jsc-for-qtscript-4.6-staging-30092009 ( e8f42cf0203bee0ba89a05e0e773d713782129b4 )
| | * | | | Fix linking on windows, building qt in namespaceJarek Kobus2009-09-301-1/+3
| | |/ / / | | | | | | | | | | | | | | | RevBy: Thiago Macieira <thiago.macieira@trolltech.com>
| | * | | fix string builder for QT_NO_CAST_FROM_ASCII on Windowshjk2009-09-301-2/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-09-308-160/+81
| | |\ \ \
| | | * | | Fix a memory leak of EGLSurface's in QGLContextRhys Weatherley2009-09-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Julian de Bhal
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-09-305-153/+64
| | | |\ \ \
| | | | * | | Convert OpenGL convolution filter to OpenGL2 paint engineRhys Weatherley2009-09-301-120/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The convolution filter was still using the old-style OpenGL1 method for interfacing to the paint engine. Reviewed-by: trustme
generated by cgit v0.12 at 2024-09-25 21:27:33 (GMT)