diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:29:51 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:29:51 +0200 |
| commit | 3cae63081cc2d5878527d80bc199fee64727e123 (patch) | |
| tree | 6a0581610ab180450d946735cc2418ad7953e379 /src/render | |
| parent | 859700748aebd6fd5088107ce9e148eeed7897b4 (diff) | |
| parent | 47f3704afc59d0dba0f5d2c8626cfdb443436b19 (diff) | |
Merge dev into 5.8
Change-Id: I45c8bf3908a6a79b43f3023e54e5c1a2cf2c52cb
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/render.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/render/render.pro b/src/render/render.pro index b3c5fa1ad..267664220 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -34,8 +34,6 @@ HEADERS += \ qt3drender_global.h \ qt3drender_global_p.h -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL - # otherwise mingw headers do not declare common functions like ::strcasecmp win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x |