diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 06:37:55 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 06:37:55 (GMT) |
| commit | dc904e1d9a110f8580cde4543a4c4b3813fa26e1 (patch) | |
| tree | 0ceea85a521044407868cc8afc937bafd548bbb3 /src/gui/painting/qpaintengine.h | |
| parent | 3e301a89f613a2304392236085e593ad765d741a (diff) | |
| parent | 028655065de7f989a35b63bcab583767aba9c048 (diff) | |
| download | Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.zip Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.gz Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
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 f1e83dc..bed2ab3 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 |