From d2d519f72433d70c342ed4cf0827a10ab0cdfdad Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Mon, 8 Mar 2010 10:24:49 +0100
Subject: Enable cleanup hooks when creating an EGL surface for a pixmap

Reviewed-By: TrustMe
---
 src/gui/egl/qegl_x11.cpp  | 12 +++++++-----
 src/opengl/qgl_x11egl.cpp |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index 8608523..53c4711 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -41,18 +41,19 @@
 
 #include <QtCore/qdebug.h>
 
-#include <private/qt_x11_p.h>
+#include <QtGui/private/qt_x11_p.h>
 #include <QtGui/qx11info_x11.h>
-#include <private/qpixmapdata_p.h>
-#include <private/qpixmap_x11_p.h>
+#include <QtGui/private/qpixmapdata_p.h>
+#include <QtGui/private/qpixmap_x11_p.h>
+#include <QtGui/private/qimagepixmapcleanuphooks_p.h>
 
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qwidget.h>
 #include <QtGui/qcolormap.h>
 
-#include "qegl_p.h"
-#include "qeglcontext_p.h"
+#include "QtGui/private/qegl_p.h"
+#include "QtGui/private/qeglcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -408,6 +409,7 @@ EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEg
                                                  (EGLNativePixmapType) x11PixmapData->handle(),
                                                  surfaceAttribs.properties());
         x11PixmapData->gl_surface = (Qt::HANDLE)surf;
+        QImagePixmapCleanupHooks::enableCleanupHooks(x11PixmapData);
         return surf;
     }
 
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 5ffecc5..fdcc412 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -42,7 +42,6 @@
 #include "qgl.h"
 #include <private/qt_x11_p.h>
 #include <private/qpixmap_x11_p.h>
-#include <private/qimagepixmapcleanuphooks_p.h>
 #include <private/qgl_p.h>
 #include <private/qpaintengine_opengl_p.h>
 #include "qgl_egl_p.h"
-- 
cgit v0.12


From 6f17a21647fe50ea79dd902220c1887b893f25b3 Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Mon, 8 Mar 2010 11:57:03 +0100
Subject: Fix crash on Win with 16bit screendepth when copy/pasting images

Task-number: QTBUG-4687
Reviewed-by: Trond
---
 src/gui/kernel/qmime_win.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp
index e191d7b..331626c 100644
--- a/src/gui/kernel/qmime_win.cpp
+++ b/src/gui/kernel/qmime_win.cpp
@@ -948,6 +948,8 @@ bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeD
         QDataStream s(&ba, QIODevice::WriteOnly);
         s.setByteOrder(QDataStream::LittleEndian);// Intel byte order ####
         if (cf == CF_DIB) {
+            if (img.format() > QImage::Format_ARGB32)
+                img = img.convertToFormat(QImage::Format_RGB32);
             if (qt_write_dib(s, img))
                 return setData(ba, pmedium);
         } else {
-- 
cgit v0.12


From d6e302a1a9bb05f000709830d865441ca7ab8c45 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Mon, 8 Mar 2010 12:47:55 +0100
Subject: Fix build on Maemo X11

Reviewed-By: Tobias Hunger
---
 src/src.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/src.pro b/src/src.pro
index 8c21ef7..403ffe1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -112,7 +112,7 @@ src_declarative.target = sub-declarative
       contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon
       contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
       contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
-	  src_imports.depends += webkit
+	  src_imports.depends += src_webkit
       #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
    }
    contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
-- 
cgit v0.12


From b4519f022e8b715991836894fe97b6338ef7ee2b Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Mon, 8 Mar 2010 15:30:14 +0100
Subject: fix to mainwindow demo

the mask was not always correctly updated on the "blueTitleBar".

Reviewed-by: gabi
---
 demos/mainwindow/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
index 32066d7..3ddb74b 100644
--- a/demos/mainwindow/mainwindow.cpp
+++ b/demos/mainwindow/mainwindow.cpp
@@ -329,7 +329,7 @@ void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
             BlueTitleBar *titlebar = new BlueTitleBar(swatch);
             swatch->setTitleBarWidget(titlebar);
             connect(swatch, SIGNAL(topLevelChanged(bool)), titlebar, SLOT(updateMask()));
-            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()));
+            connect(swatch, SIGNAL(featuresChanged(QDockWidget::DockWidgetFeatures)), titlebar, SLOT(updateMask()), Qt::QueuedConnection);
 
 #ifdef Q_WS_QWS
             QPalette pal = palette();
-- 
cgit v0.12