diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 15:51:34 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 15:51:34 +0200 |
| commit | f51a3bf2ed75b68e6746f9154f3e44e48723a7fc (patch) | |
| tree | 6105a10f236a9478404d2a48d7c68fc3fc4da592 /src/gui/painting/qpaintengine.h | |
| parent | afd7cfce7333635edc8d3637f81cc9c3023ee874 (diff) | |
| parent | 4cc604be3fe96169c1dfdc05ff1b1a37e150e265 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
Diffstat (limited to 'src/gui/painting/qpaintengine.h')
| -rw-r--r-- | src/gui/painting/qpaintengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index f1e83dcebd..bed2ab3916 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -211,6 +211,7 @@ public: Direct3D, Pdf, OpenVG, + OpenGL2, User = 50, // first user type id MaxUser = 100 // last user type id |