From 43c0e08ba2e3487840b4063b2099bc17cdd4dce2 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Wed, 1 Jun 2011 11:06:55 +0200 Subject: Refactor glyph pretransform check Move paintEngineSupportsTransformations logic from QPainter to paint engine subclasses. Simplify and consolidate checks for cached drawing (pretransformed) and path drawing (untransformed) in raster paint engine. Fix unnecessary transform when paint engines actually take the path drawing track. Fix scaling and rotation transform in raster engine for Mac. Task-number: QTBUG-19086 Change-Id: I1c0c1800a5173d3db765b9fccfd0e7a3628e3815 Reviewed-on: http://codereview.qt.nokia.com/298 Reviewed-by: Qt Sanity Bot Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 1 + src/opengl/qpaintengine_opengl_p.h | 1 + 2 files changed, 2 insertions(+) (limited to 'src/opengl') diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index 7ba92e4244..2895d5a9b0 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -158,6 +158,7 @@ public: void setRenderTextActive(bool); bool isNativePaintingActive() const; + bool supportsTransformations(qreal, const QTransform &) const { return true; } private: Q_DISABLE_COPY(QGL2PaintEngineEx) }; diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h index 5d5f5ce652..8d0ea83a47 100644 --- a/src/opengl/qpaintengine_opengl_p.h +++ b/src/opengl/qpaintengine_opengl_p.h @@ -143,6 +143,7 @@ public: Qt::HANDLE handle() const; #endif inline Type type() const { return QPaintEngine::OpenGL; } + bool supportsTransformations(qreal, const QTransform &) const { return true; } private: void drawPolyInternal(const QPolygonF &pa, bool close = true); -- cgit v1.2.3 From 1835afe6217c562a61c37676119c0d1f081a9828 Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 18 May 2011 15:30:27 +0200 Subject: Moved common module profiles to be feature profiles. This enables external modules to also make use of them without having access to the complete QtBase source code. Change-Id: I056e45cba6c6798b76670b8d238dadb2d9f9c092 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/234 Reviewed-by: Marius Storm-Olsen --- src/opengl/opengl.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/opengl') diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index b30d4057db..079f93d3de 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -13,7 +13,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -include(../qbase.pri) +load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h -- cgit v1.2.3 From 15d6f1f0315602f5b637353cb67f52636ce1deee Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 8 Jun 2011 12:47:56 -0500 Subject: Fix modules to load(qt_module) first Change-Id: Iabdfffff09088243863a8661add73298ed8baaf3 Reviewed-on: http://codereview.qt.nokia.com/413 Reviewed-by: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- src/opengl/opengl.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/opengl') diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 079f93d3de..16a4ce00e9 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = QtOpenGL QPRO_PWD = $$PWD QT = core-private gui-private -- cgit v1.2.3