| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.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/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
| |
| |
| |
| | |
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: 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QSvgIOHandler::canRead() only looked at the 80 first bytes in a SVG
file when looking for the <svg> tag. That tag can obviously be found
at an arbitrary offset from the start of the file, depending on
e.g. comments tags.
Task-number: 255419
Reviewed-by: Kim
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add support for reading and writing for Mono, MonoLSB and Indexed
images in the tiff format.
Previously, the images were always written in RGB32, dismissing the
input format.
Task-number: 254317
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| | |
Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0))
for jpeg formats.
Reviewed-by: thierry
Task-number: 255627
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
If unixodbc detection fails, try and link/detect iodbc libraries and link against them.
Reviewed-by: Lincoln Ramsay
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Explicitly cast to integer.
Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
|
|\ \
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The resolution was not saved when the image was saved
as tiff. This fix add the resolution, and try to guess if the user have
set it in dpi or dot per centimeter
Task-number: 245242
Reviewed-by: Samuel
|
|\ \
| |/ |
|