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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
  QGLPixelBuffer should not rely on temporary QGLWidgets.
  Initialize pex.
  Remove warning.
  Fix the tests for the internal GL resource system.
  Rework how QGLTextureGlyphCache makes use of the resource system.
  The group pointer should no longer be a part of the 64 bit int.
  Enable glyph uploads from a thread in the X11 font engine.
  Make qt_pixmap_serial thread-safe.
  Clean up debug output.
  Clarification regarding the WA_X11InitThreads flag.
  Rework the internal GL resource system yet again.
  Check Qt::AA_X11InitThreads to determine pixmap usage in threads.
  Add an application attribute to control XInitThreads().
  Unnecessary alloc + remove unused headers.
  QGLPixelBuffer should manage its own paint engines.
  Remove the DDS texture cache.
  Make the GL texture cache share textures between shared contexts.
  Redesigned how GL resource management works.
  Don't use the QGLSignalProxy to clean up the thread-local shaders.
  Simplify how the QGLEngineSharedShaders object is cleaned up.
  ...

1 files changed, 9 insertions, 17 deletions

diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 8ee494f..c05f730 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -1871,11 +1871,10 @@ void tst_QGL::destroyFBOAfterContext()
 
 #ifdef QT_BUILD_INTERNAL
 
-class tst_QGLResource : public QObject
+class tst_QGLResource
 {
-    Q_OBJECT
 public:
-    tst_QGLResource(QObject *parent = 0) : QObject(parent) {}
+    tst_QGLResource(const QGLContext * = 0) {}
     ~tst_QGLResource() { ++deletions; }
 
     static int deletions;
@@ -1883,12 +1882,7 @@ public:
 
 int tst_QGLResource::deletions = 0;
 
-static void qt_shared_test_free(void *data)
-{
-    delete reinterpret_cast<tst_QGLResource *>(data);
-}
-
-Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_shared_test, (qt_shared_test_free))
+Q_GLOBAL_STATIC(QGLContextGroupResource<tst_QGLResource>, qt_shared_test)
 
 #endif
 
@@ -1908,10 +1902,9 @@ void tst_QGL::shareRegister()
     guard.setId(3);
     QVERIFY(guard.id() == 3);
 
-    // Add a resource to the first context.
-    tst_QGLResource *res1 = new tst_QGLResource();
-    QVERIFY(!qt_shared_test()->value(glw1->context()));
-    qt_shared_test()->insert(glw1->context(), res1);
+    // Request a tst_QGLResource object for the first context.
+    tst_QGLResource *res1 = qt_shared_test()->value(glw1->context());
+    QVERIFY(res1);
     QVERIFY(qt_shared_test()->value(glw1->context()) == res1);
 
     // Create another context that shares with the first.
@@ -1950,10 +1943,9 @@ void tst_QGL::shareRegister()
     QGLSharedResourceGuard guard3(glw3->context());
     guard3.setId(5);
 
-    // Add a resource to the third context.
-    tst_QGLResource *res3 = new tst_QGLResource();
-    QVERIFY(!qt_shared_test()->value(glw3->context()));
-    qt_shared_test()->insert(glw3->context(), res3);
+    // Request a resource to the third context.
+    tst_QGLResource *res3 = qt_shared_test()->value(glw3->context());
+    QVERIFY(res3);
     QVERIFY(qt_shared_test()->value(glw1->context()) == res1);
     QVERIFY(qt_shared_test()->value(glw2->context()) == res1);
     QVERIFY(qt_shared_test()->value(glw3->context()) == res3);