Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
	src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
	src/script/qscriptbuffer_p.h
	src/script/qscriptclassinfo_p.h
	src/script/qscriptecmadate.cpp
	src/script/qscriptgc_p.h
	src/script/qscriptmemberfwd_p.h
	src/script/qscriptsyntaxcheckresult_p.h
	src/script/qscriptvalueimplfwd_p.h
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	util/webkit/mkdist-webkit

5 files changed, 98 insertions, 18 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 167eb64..a3475c7 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1343,10 +1343,30 @@ void QGL2PaintEngineExPrivate::updateDepthScissorTest()
     else
         glDisable(GL_DEPTH_TEST);
 
-    if (q->state()->scissorTestEnabled)
+    if (q->state()->scissorTestEnabled) {
+        QRect bounds = q->state()->rectangleClip;
+        if (bounds.isNull() || !q->painter()->hasClipping()) {
+            if (use_system_clip)
+                bounds = systemClip.boundingRect();
+            else
+                bounds = QRect(0, 0, width, height);
+        }
+
         glEnable(GL_SCISSOR_TEST);
-    else
+        setScissor(bounds);
+    } else {
         glDisable(GL_SCISSOR_TEST);
+    }
+}
+
+void QGL2PaintEngineExPrivate::setScissor(const QRect &rect)
+{
+    const int left = rect.left();
+    const int width = rect.width();
+    const int bottom = height - (rect.top() + rect.height());
+    const int height = rect.height();
+
+    glScissor(left, bottom, width, height);
 }
 
 void QGL2PaintEngineEx::clipEnabledChanged()
@@ -1362,9 +1382,10 @@ void QGL2PaintEngineEx::clipEnabledChanged()
         if (d->use_system_clip) {
             state()->currentDepth = -0.5f;
         } else {
-            glDisable(GL_DEPTH_TEST);
             state()->depthTestEnabled = false;
         }
+
+        d->updateDepthScissorTest();
     }
 }
 
@@ -1436,9 +1457,42 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
             if ((d->use_system_clip && rect.contains(d->systemClip.boundingRect()))
                 || rect.contains(QRect(0, 0, d->width, d->height)))
                 return;
+
+            if (state()->rectangleClip.isValid()) {
+                state()->rectangleClip = state()->rectangleClip.intersected(rect.toRect());
+
+                state()->hasRectangleClip = true;
+                state()->scissorTestEnabled = true;
+
+                glEnable(GL_SCISSOR_TEST);
+                d->setScissor(state()->rectangleClip);
+
+                return;
+            }
         }
     }
 
+    if (!state()->hasRectangleClip)
+        state()->rectangleClip = QRect();
+
+    if (state()->rectangleClip.isValid() && op != Qt::NoClip && op != Qt::ReplaceClip) {
+        QPainterPath path;
+        path.addRect(state()->rectangleClip);
+
+        state()->rectangleClip = QRect();
+        d->updateDepthScissorTest();
+
+        glDepthFunc(GL_ALWAYS);
+
+        state()->maxDepth = 0.5f;
+        d->writeClip(qtVectorPathForPath(path), state()->maxDepth);
+        state()->currentDepth = 0.25f;
+        state()->depthTestEnabled = true;
+
+        glDepthFunc(GL_LEQUAL);
+        glEnable(GL_DEPTH_TEST);
+    }
+
     switch (op) {
     case Qt::NoClip:
         if (d->use_system_clip) {
@@ -1459,6 +1513,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         break;
     case Qt::ReplaceClip:
         d->systemStateChanged();
+        state()->rectangleClip = QRect();
         state()->maxDepth = 0.5f;
         glDepthFunc(GL_ALWAYS);
         d->writeClip(path, state()->maxDepth);
@@ -1497,27 +1552,30 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
     q->state()->depthTestEnabled = false;
     q->state()->scissorTestEnabled = false;
     q->state()->needsDepthBufferClear = true;
+    q->state()->hasRectangleClip = false;
 
     glDisable(GL_SCISSOR_TEST);
 
     q->state()->currentDepth = -0.5f;
     q->state()->maxDepth = 0.5f;
 
-    if (use_system_clip) {
-        QRect bounds = systemClip.boundingRect();
-        if (systemClip.numRects() == 1
-            && bounds == QRect(0, 0, width, height))
-        {
-            q->state()->needsDepthBufferClear = true;
-        } else {
-            glEnable(GL_SCISSOR_TEST);
+    q->state()->rectangleClip = QRect(0, 0, width, height);
 
-            const int left = bounds.left();
-            const int width = bounds.width();
-            const int bottom = height - (bounds.top() + bounds.height());
-            const int height = bounds.height();
+    if (use_system_clip) {
+        if (systemClip.numRects() == 1) {
+            QRect bounds = systemClip.boundingRect();
+            if (bounds == QRect(0, 0, width, height)) {
+                use_system_clip = false;
+                return;
+            }
 
-            glScissor(left, bottom, width, height);
+            q->state()->rectangleClip = bounds;
+            q->state()->scissorTestEnabled = true;
+            updateDepthScissorTest();
+        } else {
+            q->state()->rectangleClip = QRect();
+            q->state()->scissorTestEnabled = true;
+            updateDepthScissorTest();
 
             QTransform transform = q->state()->matrix;
             q->state()->matrix = QTransform();
@@ -1539,7 +1597,6 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
 
             glEnable(GL_DEPTH_TEST);
             q->state()->depthTestEnabled = true;
-            q->state()->scissorTestEnabled = true;
 
             q->state()->matrix = transform;
             q->transformChanged();
@@ -1614,6 +1671,8 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &oth
     currentDepth = other.currentDepth;
     maxDepth = other.maxDepth;
     canRestoreClip = other.canRestoreClip;
+    rectangleClip = other.rectangleClip;
+    hasRectangleClip = other.hasRectangleClip;
 }
 
 QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
@@ -1624,6 +1683,7 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
     currentDepth = -0.5f;
     maxDepth = 0.5f;
     canRestoreClip = true;
+    hasRectangleClip = false;
 }
 
 QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState()
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index ec447a3..906817b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -86,6 +86,8 @@ public:
     qreal maxDepth;
 
     bool canRestoreClip;
+    QRect rectangleClip;
+    bool hasRectangleClip;
 };
 
 
@@ -217,6 +219,7 @@ public:
 
     void writeClip(const QVectorPath &path, float depth);
     void updateDepthScissorTest();
+    void setScissor(const QRect &rect);
     void regenerateDepthClip();
     void systemStateChanged();
     uint use_system_clip : 1;
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 6381bc2..cf70991 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -66,6 +66,14 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
+#ifdef Q_OS_VXWORS
+#  ifdef open
+#    undef open
+#  endif
+#  ifdef getpid
+#    undef getpid
+#  endif
+#endif // Q_OS_VXWORKS
 #include <X11/Xatom.h>
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
@@ -823,10 +831,12 @@ void QGLContext::swapBuffers() const
                     if (!glXGetVideoSyncSGI)
 #endif
                     {
+#if !defined(QT_NO_LIBRARY)
                         extern const QString qt_gl_library_name();
                         QLibrary lib(qt_gl_library_name());
                         glXGetVideoSyncSGI = (qt_glXGetVideoSyncSGI) lib.resolve("glXGetVideoSyncSGI");
                         glXWaitVideoSyncSGI = (qt_glXWaitVideoSyncSGI) lib.resolve("glXWaitVideoSyncSGI");
+#endif
                     }
                 }
                 resolved = true;
@@ -1067,9 +1077,11 @@ void *QGLContext::getProcAddress(const QString &proc) const
             if (!glXGetProcAddressARB)
 #endif
             {
+#if !defined(QT_NO_LIBRARY)
                 extern const QString qt_gl_library_name();
                 QLibrary lib(qt_gl_library_name());
                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+#endif
             }
         }
         resolved = true;
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 3685661..abec78a 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -746,8 +746,11 @@ QGLFramebufferObject::~QGLFramebufferObject()
 
     The framebuffer can become invalid if the initialization process
     fails, the user attaches an invalid buffer to the framebuffer
-    object, or a non-power of 2 width/height is specified as the
+    object, or a non-power of two width/height is specified as the
     texture size if the texture target is \c{GL_TEXTURE_2D}.
+    The non-power of two limitation does not apply if the OpenGL version
+    is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension
+    is present.
 */
 bool QGLFramebufferObject::isValid() const
 {
diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp
index 9e1f85d..ac2e705 100644
--- a/src/opengl/qglpixelbuffer_x11.cpp
+++ b/src/opengl/qglpixelbuffer_x11.cpp
@@ -115,6 +115,7 @@ static bool qt_resolve_pbuffer_extensions()
     if (!qt_glXChooseFBConfig)
 #endif
     {
+#if !defined(QT_NO_LIBRARY)
         extern const QString qt_gl_library_name();
         QLibrary gl(qt_gl_library_name());
         qt_glXChooseFBConfig = (_glXChooseFBConfig) gl.resolve("glXChooseFBConfig");
@@ -123,6 +124,7 @@ static bool qt_resolve_pbuffer_extensions()
         qt_glXDestroyPbuffer = (_glXDestroyPbuffer) gl.resolve("glXDestroyPbuffer");
         qt_glXGetFBConfigAttrib = (_glXGetFBConfigAttrib) gl.resolve("glXGetFBConfigAttrib");
         qt_glXMakeContextCurrent = (_glXMakeContextCurrent) gl.resolve("glXMakeContextCurrent");
+#endif
     }
 
     resolved = qt_glXMakeContextCurrent ? true : false;