| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QT-2261
Reviewed-by: Tom
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't
needed any more and was never very stable anyway.
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
| |
Previously, include was relative to each version plugin's .pro file.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Oops...
Reviewed-by: Jeremy
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-4473
Reviewed-by: Paul
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-3211
Task-number: 236875
Reviewed-by: Alex
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This code is wrong:
if (brush != Qt::NoBrush)
...
It should be:
if (brush.style() != Qt::NoBrush)
...
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| |
| |
| |
| |
| |
| | |
We need to lock before falling back to QRasterPaintEngine
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qtwidgets/tst_qtwidgets.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qpainter/tst_qpainter.cpp
tests/auto/qtwidgets/tst_qtwidgets.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |/
| |/|
| | |
| | | |
Reviewed-by: Trustme
|
| | |
| | |
| | |
| | |
| | |
| | | |
This function is only exported when DirectFB is built into QtGui.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
I had the logic of the assert wrong with the isAncestorOf call.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
This will make DirectFB version tests work.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
Avoid warning when building DirectFB as part of Qt.
Reviewed-by: TrustMe
|
| | | |
|