diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:12 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:27 +0100 |
| commit | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (patch) | |
| tree | 0d813d9d72baeb1b5f7be048e775896c73f134f5 /src/opengl/opengl.pro | |
| parent | 67ea445f09db9feea4e863faa12c45fb007f53a4 (diff) | |
| parent | 4cbadf699838406d14366ce61deec03cf45113f7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index a726db2be9..ba9590ec07 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -10,11 +10,39 @@ qtConfig(opengl): CONFIG += opengl qtConfig(opengles2): CONFIG += opengles2 HEADERS += \ + qopengl2pexvertexarray_p.h \ + qopenglcustomshaderstage_p.h \ qopengldebug.h \ + qopenglengineshadermanager_p.h \ + qopenglengineshadersource_p.h \ + qopenglgradientcache_p.h \ + qopenglpaintdevice.h \ + qopenglpaintdevice_p.h \ + qopenglpaintengine_p.h \ + qopenglpixeltransferoptions.h \ + qopenglshadercache_p.h \ + qopengltexture.h \ + qopengltexture_p.h \ + qopengltexturehelper_p.h \ + qopengltexturecache_p.h \ + qopengltextureglyphcache_p.h \ + qopengltextureuploader_p.h \ qopenglwindow.h \ qtopenglglobal.h SOURCES += \ + qopengl2pexvertexarray.cpp \ + qopenglcustomshaderstage.cpp \ + qopenglengineshadermanager.cpp \ + qopenglgradientcache.cpp \ + qopenglpaintdevice.cpp \ + qopenglpaintengine.cpp \ + qopenglpixeltransferoptions.cpp \ + qopengltexture.cpp \ + qopengltexturehelper.cpp \ + qopengltexturecache.cpp \ + qopengltextureglyphcache.cpp \ + qopengltextureuploader.cpp \ qopenglwindow.cpp \ qopengldebug.cpp |