summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Make screen rotation work properly with the PowerVR screen driverRhys Weatherley2009-10-169-9/+162
| | | | | Task-number: QT-2261 Reviewed-by: Tom
* Allow setting DFBDisplayLayer background colorAnders Bakken2009-10-151-7/+59
| | | | | | | | | | We already have an option for setting the background color of the primary surface when running with NO_WM. Reuse the same option for allowing users to set the background color of the primary layer. Also fix the regexp. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Don't trust layer when using window_as_cursorAnders Bakken2009-10-151-1/+1
| | | | | | | | | When using QT_DIRECTFB_WINDOW_AS_CURSOR it's likely that the layer doesn't properly support the mouse. Seeing as one might still very well have layer support for windows I can't tie the event parsing solely to NO_DIRECTFB_LAYER. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Make QT_DIRECTFB_SUBSURFACE an opt-in optionAnders Bakken2009-10-151-2/+2
| | | | | | | | | Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt from using subsurfaces for locked surfaces. Now make the default be QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define QT_DIRECTFB_SUBSURFACE to use this option. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix a problem with QDirectFBScreen::instanceAnders Bakken2009-10-152-6/+12
| | | | | | | | If using a proxy screen QScreen::instance() will not return a QDirectFBScreen but rather a QProxyScreen. This patch lets QDirectFBScreen::instance hold its own pointer. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* qt_paint_device_metric() for fetching metricsRhys Weatherley2009-10-151-13/+1
| | | | | | | | | | Custom window surfaces, graphics systems, and Qt/Embedded screen drivers often need to access QPaintDevice::metric(), but it is protected. Hence the growing number of friends in QWidget and QImage. The qt_paint_device_metric() function provides a more future-proof approach that doesn't require lots of friends. Reviewed-by: Gunnar
* Don't create too many window surfaces in DFBAnders Bakken2009-10-131-1/+5
| | | | | | | | Since DirectFB handles the composition for us we don't need to invalidate anything when moving a window. Only on resize do we want another paint event. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Make sure we don't repaint when moving a windowAnders Bakken2009-10-131-0/+2
| | | | | | | | We need to make sure the QDirectFBWindowSurface returns true for isBuffered(). Otherwise QWSWindowSurface will force a repaint when moved. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Remove the surface holder from the PowerVR screen driverRhys Weatherley2009-10-134-148/+11
| | | | | | | The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't needed any more and was never very stable anyway. Reviewed-by: trustme
* Update the OpenGL for Qt/Embedded documentationRhys Weatherley2009-10-131-0/+6
| | | | Reviewed-by: trustme
* Remove the hybrid screen driver.Rhys Weatherley2009-10-127-961/+0
| | | | | | | | | The hybrid screen driver purports to implement OpenGL, but it uses an obsolete method of integration that confuses people who find it in the source tree. The current reference implementation is "powervr". Reviewed-by: trustme
* Stub out flush() in the PowerVR GL window surface classRhys Weatherley2009-10-082-8/+15
| | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView on PowerVR/MBX systems, it was double-flushing every frame because the window surface flush() implementation was still trying to do a raster blit after painting. This change suppresses the raster blit, leaving it up to the GL swapBuffers() call to get the painted contents onto the screen. Reviewed-by: Sarah Smith
* Fix support for 32-bit PowerVR screens with QGraphicsViewRhys Weatherley2009-10-021-5/+8
| | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView, it was still treating the window surface as RGB16. Use the screen's actual pixel format. Also ensure that PvrEglWindowSurface::image() returns a non-null QImage if the drawable hasn't been created yet. Reviewed-by: trustme
* Add "opengl2" as an option for creating an OpenGL graphics systemRhys Weatherley2009-10-011-0/+10
| | | | Reviewed-by: trustme
* Made qpluginbase.pri include properly relative to s60pluginbase.priMiikka Heikkinen2009-10-011-1/+1
| | | | | | Previously, include was relative to each version plugin's .pro file. Reviewed-by: axis
* 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>
* QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
| | | | | | Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-292-2/+5
|\
| * Fix a alpha issue with RGB32 and DirectFBAnders Bakken2009-09-291-1/+4
| | | | | | | | | | | | | | | | | | | | Since we can't use RGB32 format with DirectFB (issues regarding Qt's assumptions about the alpha byte) we need to explicitly convert images of this type to the preferred alphaPixmap format. This fixes an issue where RGB32 images get a curious gray alpha overlay. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Fix QT_VNC_NO_DISABLEPAINTING logicPaul Olav Tvete2009-09-251-1/+1
| | | | | | | | | | | | Oops... Reviewed-by: Jeremy
* | Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-12/+5
| | | | | | | | | | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-249-15/+126
|\ \ | |/
| * Fix 3.1 build - move unimplemented RFs API to the S60 pluginShane Kearns2009-09-237-7/+112
| | | | | | | | | | | | | | | | | | RFs::GetSystemDrive doesn't exist in 3.1 (even though it is in the symbian documentation). Moved it to a new function in the S60 plugins. For 3.1, it returns EDriveC, for all other versions the RFs API is used Task-number: QT-805 Reviewed-by: Iain
| * Don't disable painting with multiple screens and VNCJeremy Katz2009-09-232-8/+14
| | | | | | | | | | Task-number: QTBUG-4473 Reviewed-by: Paul
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-23146-2750/+3771
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| * QJpegImageHandle: Avoid smooth scalling when it should not.Olivier Goffart2009-09-231-1/+5
| | | | | | | | | | | | Task-number: QTBUG-3211 Task-number: 236875 Reviewed-by: Alex
| * A pen/brush can be invalid and have a valid colorAnders Bakken2009-09-181-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This code is wrong: if (brush != Qt::NoBrush) ... It should be: if (brush.style() != Qt::NoBrush) ... Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Implement QDirectFBPaintEngine::drawRoundedRectAnders Bakken2009-09-182-1/+10
| | | | | | | | | | | | We need to lock before falling back to QRasterPaintEngine Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Fix a bug in QDirectFBWindowSurface::scrollAnders Bakken2009-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | It seems that one cannot do multiple blits within a double-buffered surface in overlapping one another without doing a Flip in between. I find this a little odd and will check that it's the correct behavior but this fixes bugs in scroll(). To see a case that used to produce drawing errors check out the collidingmouse example and drag the viewport around. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Merge commit 'origin/4.5' into 4.6Rhys Weatherley2009-09-171-0/+7
| |\
| | * Fix compilation for systems with MBX PowerVR headers.Rhys Weatherley2009-09-171-0/+7
| | | | | | | | | | | | Reviewed-by: trustme
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Tom Cooksey2009-09-172-50/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * | Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * | | Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * | Make the PowerVR screen driver for QWS compile against shipped headersTom Cooksey2009-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pvr2d.h/wsegl.h headers we ship with Qt (in src/3rdparty/powervr) are meant for the PowerVR SGX. However, we use an MBX-specific define in the powervr driver. Reviewed-by: Jørgen Lind
| | * | Update license headers again.Jason McDonald2009-09-08136-544/+544
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fixes the gif plugin's rendering for some animated gif files.Pierre Rossi2009-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of optimized animated gifs, we don't want to discard the contents of the previous frame, this is handled if needed in the disposal process. Task-number: 247365 Reviewed-by: Samuel
| * | | Update the QWS PowerVR driver's pro to use the new EGL qmake varsTom Cooksey2009-09-171-2/+2
| | |/ | |/| | | | | | | Reviewed-by: Trustme
| * | Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| | | | | | | | | | | | | | | | | | This function is only exported when DirectFB is built into QtGui. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| | | | | | | | | | | | | | | | | | | | | When building DirectFB as part of QtGui and not as a plugin this patch will export two global functions for getting a surface given a widget. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| | | | | | | | | | | | | | | | | | I had the logic of the assert wrong with the isAncestorOf call. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Enabled use of graphics system with old GL engine for testing.Samuel Rødal2009-09-111-1/+9
| | | | | | | | | | | | Reviewed-by: Trond
| * | Fix a bug with mouse events in DirectFBAnders Bakken2009-09-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd to just ignore the actual data in the input event but when the layer and the event differs the layer is correct. Reviewed-by: TrustMe
| * | DWDESC_OPTIONS was added for DirectFB 1.1Anders Bakken2009-09-101-1/+4
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | s/DIRECTFB_MINOR_VERION/DIRECTFB_MINOR_VERSION/Anders Bakken2009-09-101-1/+1
| | | | | | | | | | | | | | | | | | This will make DirectFB version tests work. Reviewed-by: TrustMe
| * | Use fromLatin1() in QDirectFBScreen::connect()Anders Bakken2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | Avoid warning when building DirectFB as part of Qt. Reviewed-by: TrustMe
| * | Some unneeded semicolons lessAlessandro Portale2009-09-091-1/+1
| | |