diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:24:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:28:42 +0100 |
| commit | a02863234d76abb6c9f289026ae4ea3145924f30 (patch) | |
| tree | aef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /src/opengl | |
| parent | e77b13621f0057374d83a2b884f03dd2e5b7b88c (diff) | |
| parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
mkspecs/common/wince/qplatformdefs.h
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 4 | ||||
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 9c62d41d3e..007f73c45f 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -8,8 +8,6 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf -load(qt_module) - contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles2):CONFIG += opengles2 @@ -53,3 +51,5 @@ SOURCES += qglshaderprogram.cpp \ gl2paintengineex/qpaintengineex_opengl2.cpp \ gl2paintengineex/qglcustomshaderstage.cpp \ gl2paintengineex/qtextureglyphcache_gl.cpp + +load(qt_module) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 77fc3e58f2..545df8fa44 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -688,7 +688,7 @@ bool QGLShaderProgram::init() if (d->glfuncs->hasOpenGLFeature(QOpenGLFunctions::Shaders)) { GLuint program = d->glfuncs->glCreateProgram(); if (!program) { - qWarning() << "QGLShaderProgram: could not create shader program"; + qWarning("QGLShaderProgram: could not create shader program"); return false; } if (d->programGuard) @@ -696,7 +696,7 @@ bool QGLShaderProgram::init() d->programGuard = createSharedResourceGuard(context, program, freeProgramFunc); return true; } else { - qWarning() << "QGLShaderProgram: shader programs are not supported"; + qWarning("QGLShaderProgram: shader programs are not supported"); return false; } } |