| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Add unsupportedCompositionMode to the output.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
This ifdef was simply in the wrong place.
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Also. Make sure to call QRasterPaintEngine::end()
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Move the code from QDirectFBPaintEnginePrivate::(end|begin) into
QDirectFBPaintEngine::(end|begin)
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
We already do this in QDirectFBWindowSurface::scroll
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
|
| |
| |
| |
| |
| |
| | |
This bug made us call lock more than we needed to.
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Make sure surfaces always are locked when used as source for something.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logic regarding whether or not a pen was simple was broken.
Essentially the pen is sonly simple if it should en up as a single pixel
line.
Reviewed-by: Donald <qt-info@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| |
| |
| |
| |
| |
| |
| | |
No need to set the pen in begin. It's always done before it's used
anyway.
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
Mark the functions that are reimplemented as virtual in declaration.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Make sure we always set w, h and d.
See fa8030a935acaacee570eee320e7510a4cfdc853
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change moves the w, h, d variables to QPixmapData and introduces
is_null to keep track of nullness. This is possible only because
QPixmapData is internal API; otherwise we'd have to be smarter.
The optimization makes the QPixmap::width() function take 7 instructions,
down from 34 before. For the calculator demo in the declarative ui branch
this reduces a block of 750000 instructions (out of 30000000) to around
100000-150000 instructions.
Tested on Windows, Linux, Mac. Raster, X11 and OpenGL paint engines. Have
not tested the DirectFB engine.
Reviewed-by: Trond
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
s/y2/bottom()/
Compile.
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| |
| |
| |
| |
| |
| |
| | |
Some options were added for 0.9.23. This change adds some ifdefs so DFB
0.9.22 compiles
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Not sure to what extent it actually works but atleast it compiles now.
- A couple of image formats doesn't exist in 0.9
- IDirectFBSurface::ReleaseSource doesn't exist in 0.9
- IDirectFBWindow::SetBounds doesn't exist in 0.9
Reviewed-by: Donald <qt-info@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| |
| |
| | |
We need to set alpha to the right value when copying pixmaps.
Reviewed-by: Donald <qt-info@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
|
| |
| |
| |
| |
| |
| | |
The batch-blits buys us nothing and this is much more readable.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
DirectFB and Qt treats these things rather differently so the mapping
just doesn't work very well. Only use DirectFB for SourceOver stuff
(which is the default mode anyway)
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously we allowed RGB32 but forced fallbacks for all drawing
operations. It turns out blitting operations doesn't work right either
so we'll rather just disallow this format altogether. See also
36ae58e7a6a888d3ae7bd162d59daada550bbfb1
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Due to incompatibilities between RGB32 in DirectFB and Qt we can't use
RGB32.
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Explicitly cast to integer.
Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Since this is C there are no constructors.
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
QDirecttFBPixmapData => QDirectFBPixmapData
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| |
| | |
Include info on the primary surface pixelformat.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
We're just printout out the integer value anyway.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| | |
Needed for fallback warnings
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Put all variables in the same area for QDirectFBPaintEnginePrivate. Make
QDirectFBPaintEngine a friend.
Also, do away with setClipDirty and replace it with d->clipDirty = true;
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
Move private functions to the bottom of the file to be more in line with
how most qt cpp files are structured.
Reviewed-by: TrustMe
|