diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-20 12:58:22 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-05 16:47:37 +0200 |
| commit | e48737ae778b8ef5e8e905825a2787b97deea23d (patch) | |
| tree | 220628a632981dd709e801d2855e563989b39331 /src/gui/kernel/kernel.pri | |
| parent | b53e08e3356528e7d240188c8985e205a6eaa2a2 (diff) | |
Introduce QOpenGLWindow
[ChangeLog] Added QOpenGLWindow. This serves as a convenience class for
creating windows showing OpenGL content via an API similar to QGLWidget
and without any widget dependencies.
Done-with: Jorgen Lind <jorgen.lind@digia.com>
Task-number: QTBUG-36899
Change-Id: I52e9bc61acb129dbfd3841b3adeffab2dbcf7f05
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/gui/kernel/kernel.pri')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 2aeea6288b..bc167cea57 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -69,7 +69,9 @@ HEADERS += \ kernel/qplatformscreenpageflipper.h \ kernel/qplatformsystemtrayicon.h \ kernel/qplatformsessionmanager.h \ - kernel/qpixelformat.h + kernel/qpixelformat.h \ + kernel/qpaintdevicewindow.h \ + kernel/qpaintdevicewindow_p.h SOURCES += \ kernel/qgenericpluginfactory.cpp \ @@ -121,17 +123,20 @@ SOURCES += \ kernel/qplatformsystemtrayicon.cpp \ kernel/qplatformsessionmanager.cpp \ kernel/qplatformmenu.cpp \ - kernel/qpixelformat.cpp + kernel/qpixelformat.cpp \ + kernel/qpaintdevicewindow.cpp contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { HEADERS += \ kernel/qplatformopenglcontext.h \ kernel/qopenglcontext.h \ - kernel/qopenglcontext_p.h + kernel/qopenglcontext_p.h \ + kernel/qopenglwindow.h SOURCES += \ kernel/qplatformopenglcontext.cpp \ - kernel/qopenglcontext.cpp + kernel/qopenglcontext.cpp \ + kernel/qopenglwindow.cpp } win32:HEADERS+=kernel/qwindowdefs_win.h |