Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits)
  Doc: these files are NOT part of the test suite of the Qt toolkit
  Autotest: make the licenseCheck test also check .qdoc files
  use egl properties when creating surfaces on symbian
  work around the current include file structure on Symbian^3
  Get rid of the dependency on the Symbian app layer
  Fix incorrect license headers
  Fix incorrect license headers
  tst_qnetworkreply: Check if TCP/HTTP connection got re-used
  Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
  Fix building in a namespace on Windows
  Supressed Icon sizes on QPushButton in QS60Style
  Ensure that posted events are sent on Windows
  Fixed off-by-one blending errors in the NEON drawhelper code.
  Fixed libstdcpp.dll version autodetection for Symbian
  Fixed linkage failure when building qmake on Unix platforms
  Factored epocRoot implementation out of qmake
  Factored readRegistryKey implementation out of qmake
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.
  ColorDialog is always shown as stripped-down version (for QVGA)
  ...

1 files changed, 4 insertions, 8 deletions

diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index a7de9c8..87ed818 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -86,14 +86,12 @@ public:
     QEgl::API api() const { return apiType; }
     void setApi(QEgl::API api) { apiType = api; }
 
-    bool openDisplay(QPaintDevice *device);
     bool chooseConfig(const QEglProperties& properties, QEgl::PixelFormatMatch match = QEgl::ExactPixelFormat);
     bool createContext(QEglContext *shareContext = 0, const QEglProperties *properties = 0);
+    void destroyContext();
     EGLSurface createSurface(QPaintDevice *device, const QEglProperties *properties = 0);
     void destroySurface(EGLSurface surface);
 
-    void destroy();
-
     bool makeCurrent(EGLSurface surface);
     bool doneCurrent();
     bool lazyDoneCurrent();
@@ -108,7 +106,7 @@ public:
     static EGLint error() { return eglGetError(); }
     static QString errorString(EGLint code);
 
-    EGLDisplay display() const { return dpy; }
+    static EGLDisplay display();
 
     EGLContext context() const { return ctx; }
     void setContext(EGLContext context) { ctx = context; ownsContext = false;}
@@ -118,8 +116,6 @@ public:
 
     QEglProperties configProperties(EGLConfig cfg = 0) const;
 
-    static EGLDisplay defaultDisplay(QPaintDevice *device);
-
     void dumpAllConfigs();
 
     static QString extensions();
@@ -127,7 +123,6 @@ public:
 
 private:
     QEgl::API apiType;
-    EGLDisplay dpy;
     EGLContext ctx;
     EGLConfig cfg;
     EGLSurface currentSurface;
@@ -135,7 +130,8 @@ private:
     bool ownsContext;
     bool sharing;
 
-    static EGLDisplay getDisplay(QPaintDevice *device);
+    static EGLDisplay dpy;
+    static EGLNativeDisplayType nativeDisplay();
 
     static QEglContext *currentContext(QEgl::API api);
     static void setCurrentContext(QEgl::API api, QEglContext *context);