summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Got rid of redundant texture parameter settings in GL pixmap filters.Samuel Rødal2009-10-291-16/+0
| | | | | | The texture parameters are set in drawTexture anyways. Reviewed-by: Gunnar Sletta
* Added some optimizations to the blur and drop shadow GL filters.Samuel Rødal2009-10-298-195/+307
| | | | | | | | | | | | | | | | | | | | * Use ExpandToTransparentBorderPadMode since we can use GL_CLAMP_TO_EDGE to clamp to the texture. * Shrink the bounding rects reported by the blur and drop shadow filters (expanding by 2 * radius isn't needed). * Use a single-pass blur for radii <= 3 to avoid the overhead of rendering to an FBO. * Made the fast blur setting generate filters for only a predefined set of radii, and then use the actual blur radius to spread the sample points outwards. * Optimized the generated program to rely less on temporary variables, as those seemed to not be handled very well by certain GLSL compilers. Reviewed-by: Gunnar Sletta
* Fixed highlighting of string components when inputting Japanese text.Kim Motoyoshi Kalland2009-10-291-20/+5
| | | | | | | | | | After typing a sentence in Japanese, and before committing the sentence, you can select each component and choose a different character representation for it. This commit fixes highlighting of the currently selected sentence component which was broken by commit 55137901. Reviewed-by: Marius Storm-Olsen
* Fix bug for message error "Texture updload failed, error code 0x500"Stefano Pironato2009-10-281-1/+0
| | | | | | | | | | | | The error message come from the QGLContextPrivate::bindTexture. But since OpenGl errors are retains until glGetError is called the actual error was happening somewhere else. After adding in all the gl* call a check for a gl error, I was able to get the place where opengl fail with a GL_INVALID_ENUM. This happen in the call of glEnable(GL_TEXTURE_2D) in the file qgl_x11egl.cpp. This glEnable call does not need: removed. Reviewed-by: Tom Cooksey
* Fix raster paintengine handling with invalid imagesChristoph Feck2009-10-281-0/+3
| | | | | | | | | | | | | | | | | | | initTexture() has explicit handling of invalid images, but when calling adjustSpanMethods() the invalid case is not handled for Type == Texture. This caused two types of crashes: * call to 0 address, because sourceFetch[] has 0 pointer for QImage::Format_Invalid (see https://bugs.kde.org/show_bug.cgi?id=176014) * division by zero in tiled blend functions, because of the " % image_size" modulo arithmetic. (see https://bugs.kde.org/show_bug.cgi?id=203231) Merge-request: 1213 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-285-11/+22
|\
| * Fix QtOpenGL linker issue by exporting qt_getClipRectsThorbjørn Lindeijer2009-10-271-1/+1
| | | | | | | | | | | | | | It is used in qwindowsurface_x11gl.cpp. The problem only showed when building in release mode due to previous use of Q_AUTOTEST_EXPORT. Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| * Use shared memory images when shared pixmaps are not available.Fredrik Höglund2009-10-274-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | Modern graphics drivers tend to disable shared memory pixmaps, since rendering operations often can't be accelerated by the GPU when the pixmap data is pinned in system RAM. Use XShmPutImage() to flush the window surface when this is case, instead of falling back to the slower XPutImage() method. Merge-request: 1684 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2830-50/+20666
|\ \ | |/ |/|
| * qdoc: Update QGraphicsTransform docs after changes to QGraphicsRotationRhys Weatherley2009-10-281-0/+3
| | | | | | | | Reviewed-by: Michael Brasser
| * Doc: Fixed qdoc warning.David Boddie2009-10-271-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Fix for Gtk+ toolbuttons and sliders.Robert Griebl2009-10-273-7/+34
| | | | | | | | | | | | Maemo5 looks very weird without these patches. Reviewed-By: jbache
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-10-2725-42/+20628
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-2773-596/+1259
| | |\
| | * | Fixed select softkey for comboboxes (QTBUG-4702).Janne Anttila2009-10-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The created keyed actions are passed to wrong widget if this pointer is passed insted of itemView. Also create softkey actions in setItemView method instead of constructor in order that custom items views are also working correctly. Task-number:: QTBUG-4702 AutoTest: All QComboBox tests passed Reviewed-by: Jason Barron
| | * | Removed the need for extra Symbian traps after QApp construction.axis2009-10-262-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by putting back the old trap handler after the S60 framework construction has finished. Task: QTBUG-4960 AutoTest: Included and passed RevBy: Shane Kearns
| | * | Fixed a crash in the QApplication autotest.axis2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no focusWidget at the time of the event delivery, we must ensure that we don't dereference a null pointer. RevBy: Jason Barron RevBy: Liang Qi
| | * | Remove compilation warning from QtGuiSami Merilä2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style causes a compilation warning due to using incorrect parameter when adjusting rect size in adjusted() call. The problematic line is using twice same parameter and thus leaves one pre-set parameter unused, which causes a compilation warning. Fixed by using the correct parameter. Task-number: N/A Reviewed-by: Trust Me
| | * | Small updates to WINSCW DEF filesIain2009-10-237-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the originals may have had some extra exports from udeb in them Reviewed-by: TrustMe
| | * | *Experimental* WINSCW DEF files for Qt, except WebKitIain2009-10-2311-0/+20308
| | | | | | | | | | | | | | | | | | | | | | | | Note: No autotest exports, no EGL exports from QtGui Reviewed-by: Jason Barron
| | * | Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-231-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e. DEF file was unconditionally enabled for Webkit, ignoring setting in qtbase.pri, which was supposed to be the global place to enable/disable DEF file usage. Remove this workaround since we still haven't got DEF files switched on by default.
| | * | OpenVG EABI DEF fileIain2009-10-231-0/+232
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Softkeys should not put exit by default on RSK for dialogs and popups.Janne Anttila2009-10-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that softkeys and pop-ups need to take care of setting all softkeys by themselves. Task-number: QTBUG-4916 Reviewed-by: Jason Barron
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-231312-11946/+34750
| | |\ \
| | * | | QtGui def file updateShane Kearns2009-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | Two new APIs in QDesktopWidget
| | * | | Fix def file error for qtcoreShane Kearns2009-10-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem caused by freezing with wrong openC version in environment Reviewed-by: TrustMe
| | * | | update QtGui def fileShane Kearns2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One private export has been changed from non-const to const pointer parameter Reviewed-by: TrustMe
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-22112-3780/+6777
| | |\ \ \
| | * | | | Update 4.6 def filesShane Kearns2009-10-222-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | QtGui release/debug binary compatibilityShane Kearns2009-10-226-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui had some debug functions only exported in the debug build. Now these are exported in release mode as well, but as stubs (i.e. no debug output is generated). Reviewed-by: Thiago Macieira
| | * | | | Lowering toplevel widget puts app to background.Miikka Heikkinen2009-10-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since raising toplevel widget nowdays brings the whole app to top, logically lowering toplevel widget should put the app to background. Reviewed-by: axis
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2717-138/+209
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix integer overflow in string.remove len parameterMarkus Goetz2009-10-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 262677 Reviewed-by: joao
| * | | | | Carbon: active window not restoredRichard Moe Gustavsen2009-10-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After closing a window we used to go through the list of kDocumentWindowClass windows to pick the next one to pop to front. This patch will search the kMoveableWindowClass list of windows first, and as such, pop to front any modal window first Rev-By: MortenS
| * | | | | Implement support for wheel delta with finer resolution than 15 deg.Richard Moe Gustavsen2009-10-274-71/+38
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, Qt, in many places, does not really understand that a mouse wheel, or touch pad, might operate on a much higher granularity than 15 degrees (that is, a delta of 120). This is clear disadvantage on mac, since the mighty mouse, and track pad, got a resolution that is close to 1 degree. This is called pixel scrolling. This patch first and formost changes the implementation of QAbstractSlider::wheelEvent to _really_ understand what to do when delta is less than 120. Rather than accumulate delta until 120 is reached, then scroll with a value equal to: offset * step * QApplication::wheelScrollLines (default = 3), we multiply offset directly, before waiting for 120. This means that event tough offset is below 120, multiplying it with wheelScrollLines and step will very often give a value over 120, menaing we can scroll much earlier and _much more_ fined grained. This also fixes some auto tests that was ifdeffed out because of specialised mac code written inside this function from before. (NB: we still plan to introduce a new event for pixel scrolling, perhaps for Qt-4.7) Rev-By: Andreas Rev-By: denis
| * | | | Fix OpenVG window composition when opacity != 1Rhys Weatherley2009-10-271-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2322 Reviewed-by: Sarah Smith
| * | | | Use vgClear() to clear the background during screen compositing.Rhys Weatherley2009-10-271-18/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an "off by 1" bug in screen compositing with OpenVG that left lines all over the background when windows were moved. Task-number: QT-2322 Reviewed-by: Sarah Smith
| * | | | Fixes Oracle batchExec using strings as out params.Bill King2009-10-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reserve() affects capacity(), not length(). Task-number: QTBUG-551
| * | | | Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-261-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e. DEF file was unconditionally enabled for Webkit, ignoring setting in qtbase.pri, which was supposed to be the global place to enable/disable DEF file usage. Remove this workaround since we still haven't got DEF files switched on by default. (cherry picked from commit 3b7f570e6f296ef0a5c9c581ed06cb19986164a0)
| * | | | Doc: Added internal or hidden placeholder documentation.David Boddie2009-10-261-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
| * | | | Doc: Fixed qdoc warnings.David Boddie2009-10-263-7/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Doc: Fixed qdoc warnings.David Boddie2009-10-261-2/+21
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | QSslSocket: Add \reimp to the socket option functionsMarkus Goetz2009-10-261-0/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago
| * | | | QPixmap::loadFromData: Do not crash on empty/invalid data/lengthMarkus Goetz2009-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 262636 Reviewed-by: gunnar
| * | | | Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-10-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
| * | | | Fix linking of WebKit on Linux 32-bit.Thiago Macieira2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
* | | | | Fixed QPainterPath to properly set the convex hint on QVectorPath'sGunnar Sletta2009-10-272-14/+38
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-2712-631/+125
|\ \ \ \ \
| * | | | | Made blur and drop shadow APIs use qreal instead of int for blur radius.Samuel Rødal2009-10-275-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to lock ourselves to int in the API when some of the backend could handle floating point blur radii. Reviewed-by: Bjørn Erik Nilsen
| * | | | | Options on how to get a pixmap from an effect sourceGunnar Sletta2009-10-277-18/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usable for future optimizations. Reviewed-by: Samuel