diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 3 | ||||
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index b01ca80829..4d9208d983 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -8,9 +8,6 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf -ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \ - "plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so" - load(qt_module) contains(QT_CONFIG, opengl):CONFIG += opengl diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index a9871967f2..66e1aca9bc 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -976,7 +976,7 @@ bool QGLFramebufferObject::isValid() const bool QGLFramebufferObject::bind() { if (!isValid()) - return false; + return false; Q_D(QGLFramebufferObject); QGL_FUNC_CONTEXT; if (!ctx) @@ -1008,7 +1008,7 @@ bool QGLFramebufferObject::bind() bool QGLFramebufferObject::release() { if (!isValid()) - return false; + return false; Q_D(QGLFramebufferObject); QGL_FUNC_CONTEXT; if (!ctx) |