Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix project file generation for MSVC 2010
  Fix wrong translation and clip for the raster paint-engine on Mac
  Return the correct library name in qt_gl_library_name for GLES*
  qmake: remove useless evaluation of variables from VS project generators
  Fix QT_NO_LIBRARY
  Documentation for the Elastic Nodes example.
  qmake: fix duplicate linker options in VS project files
  Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
  qmake: fix duplicate compiler options in VS project files
  Documentation for the Drag and Drop Robot example.
  Fix crash in styles example when running with opengl graphicssystem
  Fixed the sizehint for cols/rows in qtableview
  QUrl: parsing of host name with an undercore.
  Null pointer check
  Revert "Try to use multisampled opengl graphicssystem on all platforms"
  A small mistake when comparing the flag.
  Add unit tests covering most of QVector's API.
  Fix crash when CoreText fails to shape text for us
  Fix crash when using opengl graphicssystem on desktop
  Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""

1 files changed, 14 insertions, 8 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index bf77eda..7abf4bc 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2782,8 +2782,8 @@ void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum text
          if (!eng->isNativePaintingActive()) {
             QRectF src(0, 0, target.width(), target.height());
             QSize size(target.width(), target.height());
-            eng->drawTexture(target, textureId, size, src);
-            return;
+            if (eng->drawTexture(target, textureId, size, src))
+                return;
         }
      }
 
@@ -2858,8 +2858,8 @@ void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum text
             QRectF dest(point, QSizeF(textureWidth, textureHeight));
             QRectF src(0, 0, textureWidth, textureHeight);
             QSize size(textureWidth, textureHeight);
-            eng->drawTexture(dest, textureId, size, src);
-            return;
+            if (eng->drawTexture(dest, textureId, size, src))
+                return;
         }
     }
 
@@ -5169,11 +5169,17 @@ Q_OPENGL_EXPORT void qt_set_gl_library_name(const QString& name)
 Q_OPENGL_EXPORT const QString qt_gl_library_name()
 {
     if (qt_gl_lib_name()->isNull()) {
-#if defined(Q_WS_X11) || defined(Q_WS_QWS)
-        return QLatin1String("GL");
-#else // Q_WS_MAC
+#ifdef Q_WS_MAC
         return QLatin1String("/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib");
-#endif
+#else
+# if defined(QT_OPENGL_ES_1)
+        return QLatin1String("GLES_CM");
+# elif defined(QT_OPENGL_ES_2)
+        return QLatin1String("GLESv2");
+# else
+        return QLatin1String("GL");
+# endif
+#endif // defined Q_WS_MAC
     }
     return *qt_gl_lib_name();
 }