diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /examples/painting/composition/main.cpp | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'examples/painting/composition/main.cpp')
| -rw-r--r-- | examples/painting/composition/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/examples/painting/composition/main.cpp b/examples/painting/composition/main.cpp index d6bc170a97..3c6a16aaf5 100644 --- a/examples/painting/composition/main.cpp +++ b/examples/painting/composition/main.cpp @@ -50,9 +50,6 @@ int main(int argc, char **argv) { // Q_INIT_RESOURCE(deform); -#ifdef QT_OPENGL_SUPPORT - QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); -#endif QApplication app(argc, argv); CompositionWidget compWidget(0); |