| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| | |
Certain boards are not support StretchBlit very well. This patch enables
them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster
engine for stretchblits.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|/
|
|
|
|
|
| |
QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object
but doesn't set its serial number.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
When running the X11 emulator of DirectFB IDirectFBScreen->GetSize
returns the size of the entire X11 Display, not the actual DirectFB
window.
We can read this from the primary layer instead and this value is
correct both on devices and on the desktop.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| |
|
|
|
|
|
|
| |
Remove some superfluous spaces.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch enables you to use a different layer for Qt apps by
specifying:
E.g.
QWS_DISPLAY=directfb:layerid=2
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
| |
For better compatibility with non-QWS DirectFB apps running in the same
session we should set the stacking class of Windows that have the
StaysOnTop flag set. This corresponds nicely to DWSC_UPPER.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
|\ |
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
|/
|
|
|
|
|
|
| |
This value seems to cause problems on various chipsets and we get a
double buffered window regardless.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
|
|
|
|
|
|
|
| |
QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|
|
|
|
|
|
|
|
|
| |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|
|
|
|
|
|
| |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|
|
|
|
|
|
|
|
|
|
| |
Qt's/DirectFB's composition modes are not compatible for drawing
operations. We only support SourceOver and handle whether or not to
blend colors using DSDRAW_BLEND based on the alpha/opacity value.
If drawing with Source and an opaque color we can still handle the
operation using DirectFB. This has major impact since WebKit fills the
background of web pages using Source.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
| |
When drawing primitives in DirectFB we always set composition mode to
NONE and manually manage whether or not to blend. This patch makes sure
we will reset the composition mode afterwards.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Since QWS uses the winids for its own purposes I have to store this as a
dynamic property. _q_DirectFBWindowID
The _q_ is documented to be reserved so this won't break anyone's
applications.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
| |
This function has been declared since the initial commit but was never
actually implemented. The function exists in
QDirectFBWindowSurface.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
This fix should optimize pixmap loading on most platforms and also fixes
a bug on a certain hardware where the alpha channel of an image was not
retained upon loading it.
This patch also takes care of handling dithering better in
QDirectFBPixmapData::fromImage().
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
| |
It's QT_NO_DIRECTFB.*, not QT_DIRECTFB_NO.*
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
This makes debugging easier.
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
If we make sure to erase the background to background color in connect()
we don't have to do it in setGeometry.
Also clean up the code in QDBWindowSurface::flush
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
| |
No need to carry those extra bytes around when QT_DIRECTFB_WM is
defined.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
| |
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|