| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| | |
already created.
Merge-request: 967
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
4444 16bit are too bad quality-wise.
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
It was a bug/mistake to support that.
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
16bit.
Merge-request: 2496
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Moving code from qmeegopixmapdata there.
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2493
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
(was a driver bug after all).
Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Was required to implement a new subclass to make this happen.
Merge-request: 863
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 854
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Use GL_RGB16 for no-alpha images and RGBA4 for alpha images.
Merge-request: 854
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
S^3 does not have a client side API to support semi-transparent EGL
surfaces so if this flag is enabled for a particular widget, then we
should return a raster surface instead of a VG surface. Raster surfaces
can still be semi-transparent but will be slower to render to.
Task-number: QTBUG-14400
Reviewed-by: Jani Hautakangas
Reviewed-by: Gareth Stockwell
Reviewed-by: Sami Merila
|
| |
| |
| |
| |
| | |
Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| |
| |
| |
| |
| |
| |
| | |
X11 symbols are conflicting with some of the Qt ones. Qt headers needs
to be included before the X11 ones in order to compile on Maemo.
Reviewed-by: Samuel Rødal
|
| |
| |
| |
| |
| |
| | |
We don't rely on this header, so there's no need to include it.
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Setting NoSystemBackground means that top-level widget backgrounds don't
get painted any more. Another work-around must be found to prevent
flickering.
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| | |
Also, this prevents hard-coding the path to the meego plugin.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
From http://www.gitorious.com/meego-graphics/meego-graphics
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
|
| |
| |
| |
| |
| | |
Task-number: QT-2139
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
and moved it onto QBlittablePixmap making the class abstract. The
creator function was seen as to spesialised to be part of the
PlatformIntegration class, and belonged to the QBlittablePixmap class
anyway since that was the PixmapData type you would need to return to
use the blitter api. Also removed the cross platform examples as they
are more confusing than anything else. For usage of QBlittable look in
the directfb platform integration plugin.
|
| |
| |
| |
| | |
also renaming the embedded_lite qmake switch to be qpa
|
| |
| |
| |
| | |
Rename Q_WS_LITE -> Q_WS_QPA
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/egl/egl.pri
src/gui/painting/qwindowsurface_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the OpenGL graphics system is in X11GL mode, it will use the
QX11GLWindowSurface for all widgets except QGraphicsViews with the
FullViewportUpdate update mode set, where it will use the regular
QGLWindowSurface, as this is probabbly faster.
QX11GLWindowSurface differs from QGLWindowSurface because it allows
accelerated scrolling and partial updates, while still being using
opengl to do rendering.
Task-number: QT-280
Task-number: QT-2625
Reviewed-By: Trond
|