qt4: version bump 4.7.4 -> 4.8.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

14 files changed, 135 insertions, 181 deletions

diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0006-Hack-disable-Wl-gc-sections-on-ppc.patch b/patches/qt-everywhere-opensource-src-4.7.4/0006-Hack-disable-Wl-gc-sections-on-ppc.patch
deleted file mode 100644
index d1cf09789..000000000
--- a/patches/qt-everywhere-opensource-src-4.7.4/0006-Hack-disable-Wl-gc-sections-on-ppc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Oct 2010 20:13:41 +0200
-Subject: [PATCH] Hack: disable -Wl,--gc-sections on ppc
-
-The linker in our toolchain crashes with -Wl,--gc-sections on PowerPC.
-This patch removes this option and related options when building
-for PowerPC.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/3rdparty/webkit/WebCore/WebCore.pro |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
-index c70a168..baa7102 100644
---- a/src/3rdparty/webkit/WebCore/WebCore.pro
-+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -88,8 +88,8 @@ unix {
-     QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
- }
- 
--unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
--unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!isEqual(QT_ARCH, powerpc):!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-+unix:!isEqual(QT_ARCH, powerpc):!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
- linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
- 
- CONFIG(release):!CONFIG(standalone_package) {
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0009-QSslCertificate-block-all-DigiNotar-intermediate-and.patch b/patches/qt-everywhere-opensource-src-4.7.4/0009-QSslCertificate-block-all-DigiNotar-intermediate-and.patch
deleted file mode 100644
index 1819cad92..000000000
--- a/patches/qt-everywhere-opensource-src-4.7.4/0009-QSslCertificate-block-all-DigiNotar-intermediate-and.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 8 Sep 2011 23:07:44 +0200
-Subject: [PATCH] QSslCertificate: block all DigiNotar (intermediate and root)
- certs
-
-and do not only check leaf certificates, but all intermediates and
-the root. Tested manually with the cross-signed intermediates.
-
-Patch as provided from upstream:
-http://qt.nokia.com/files/qt-patches/blacklist-diginotar-certs.diff
-
-See also:
-http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/network/ssl/qsslcertificate.cpp    |   45 ++++++++++++++++++++++++-------
- src/network/ssl/qsslsocket_openssl.cpp |   16 +++++++----
- 2 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+    "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+    "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+    "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+    "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+    "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+    "1184640176",                                      "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+    "120000525",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000505",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000515",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "20015536",                                        "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+    "20001983",                                        "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+    "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+    "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+//    "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+    "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+    "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-     0
- };
- 
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
-     for (int a = 0; certificate_blacklist[a] != 0; a++) {
--        if (certificate.serialNumber() == certificate_blacklist[a])
-+        QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+        if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+            (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+             certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
-             return true;
-     }
-     return false;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 141d80a..b8e6c4c 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
--    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
--        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
--        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
--        emit q->error(QAbstractSocket::SslHandshakeFailedError);
--        plainSocket->disconnectFromHost();
--        return false;
-+
-+    // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+    foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+        if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+            q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+            q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+            emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+            plainSocket->disconnectFromHost();
-+            return false;
-+        }
-     }
- 
-     // Start translating errors.
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/series b/patches/qt-everywhere-opensource-src-4.7.4/series
deleted file mode 100644
index 6d2615236..000000000
--- a/patches/qt-everywhere-opensource-src-4.7.4/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-mkspec-for-ptxdist.patch
-0002-disable-ordered-compiling.patch
-0003-Hack-hide-cursor-during-startup.patch
-0004-add-missing-subdirs.patch
-0005-Fix-dnd-issue-on-QWS.patch
-0006-Hack-disable-Wl-gc-sections-on-ppc.patch
-0007-qmake-make-sure-local-include-dirs-come-first.patch
-0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
-0009-QSslCertificate-block-all-DigiNotar-intermediate-and.patch
-# ebf5354566171c6e57153abe3f922d5b  - git-ptx-patches magic
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch
index fa9b18141..f01821117 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0001-mkspec-for-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch
@@ -10,11 +10,11 @@ Add a mkspec for ptxdist:
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- mkspecs/linux-ptx-g++/qmake.conf.in       |   40 +++++++++++++++++++++++++++++
+ mkspecs/linux-ptx-g++/qmake.conf.in       |   41 +++++++++++++++++++++++++++++
  mkspecs/linux-ptx-g++/qplatformdefs.h     |    2 +
- mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   31 ++++++++++++++++++++++
+ mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   32 ++++++++++++++++++++++
  mkspecs/qws/linux-ptx-g++/qplatformdefs.h |    2 +
- 4 files changed, 75 insertions(+), 0 deletions(-)
+ 4 files changed, 77 insertions(+), 0 deletions(-)
  create mode 100644 mkspecs/linux-ptx-g++/qmake.conf.in
  create mode 100644 mkspecs/linux-ptx-g++/qplatformdefs.h
  create mode 100644 mkspecs/qws/linux-ptx-g++/qmake.conf.in
@@ -22,16 +22,17 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 
 diff --git a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in
 new file mode 100644
-index 0000000..5153cf3
+index 0000000..c3e0150
 --- /dev/null
 +++ b/mkspecs/linux-ptx-g++/qmake.conf.in
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +#
 +# qmake configuration for linux-ptx-g++
 +#
 +
 +
-+include(../common/g++.conf)
++include(../common/gcc-base-unix.conf)
++include(../common/g++-unix.conf)
 +include(../common/linux.conf)
 +
 +MAKEFILE_GENERATOR      = UNIX
@@ -76,16 +77,17 @@ index 0000000..05c77d1
 +#include "../linux-g++/qplatformdefs.h"
 diff --git a/mkspecs/qws/linux-ptx-g++/qmake.conf.in b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
 new file mode 100644
-index 0000000..014b71f
+index 0000000..b52d5e7
 --- /dev/null
 +++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +#
 +# qmake configuration for linux-ptx-g++
 +#
 +
 +
-+include(../../common/g++.conf)
++include(../../common/gcc-base-unix.conf)
++include(../../common/g++-unix.conf)
 +include(../../common/linux.conf)
 +include(../../common/qws.conf)
 +
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch
index 9daa49f59..b70d7e423 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0002-disable-ordered-compiling.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch
@@ -14,7 +14,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/examples/examples.pro b/examples/examples.pro
-index f233aba..ead2214 100644
+index cf12dd6..ed7db9c 100644
 --- a/examples/examples.pro
 +++ b/examples/examples.pro
 @@ -49,6 +49,10 @@ symbian: SUBDIRS = \
@@ -29,7 +29,7 @@ index f233aba..ead2214 100644
  
  contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 diff --git a/projects.pro b/projects.pro
-index 02bf61d..ea5b0e7 100644
+index bf4dc5e..f095f0d 100644
 --- a/projects.pro
 +++ b/projects.pro
 @@ -2,7 +2,6 @@
@@ -41,10 +41,10 @@ index 02bf61d..ea5b0e7 100644
  
  cross_compile: CONFIG += nostrip
 diff --git a/src/src.pro b/src/src.pro
-index 868e22f..a803ec8 100644
+index 9314fbd..3f528ee 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -105,12 +105,13 @@ src_webkit_declarative.target = sub-webkitdeclarative
+@@ -100,12 +100,13 @@ src_declarative.target = sub-declarative
     src_qt3support.depends = src_gui src_xml src_network src_sql
     src_tools_idc.depends = src_corelib             # target defined in tools.pro
     src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro
@@ -58,20 +58,20 @@ index 868e22f..a803ec8 100644
 +   src_plugins.depends = src_gui src_sql
 +   contains(QT_CONFIG, svg):src_plugins.depends += src_svg
     contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia
+    contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative
     src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
-    src_s60installs.depends -= src_s60installs
-@@ -118,6 +119,7 @@ src_webkit_declarative.target = sub-webkitdeclarative
+@@ -114,6 +115,7 @@ src_declarative.target = sub-declarative
     contains(QT_CONFIG, webkit)  {
        src_webkit.depends = src_gui src_sql src_network
        contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
 +      contains(QT_CONFIG, phonon): src_webkit.depends += src_phonon
        src_imports.depends += src_webkit
-       exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) {
-          src_webkit.depends += src_javascriptcore
-@@ -142,6 +144,8 @@ src_webkit_declarative.target = sub-webkitdeclarative
+    }
+    contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
+@@ -133,6 +135,8 @@ src_declarative.target = sub-declarative
+    contains(QT_CONFIG, svg) {
        src_declarative.depends += src_svg
     }
-    contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit
 +   contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative
 +   contains(QT_CONFIG, phonon):src_plugins.depends += src_phonon
  }
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch
index 5fe3a10dd..5fe3a10dd 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0003-Hack-hide-cursor-during-startup.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch
index 26783e991..6a324f01c 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0004-add-missing-subdirs.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch
@@ -9,8 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  examples/declarative/modelviews/modelviews.pro |    1 +
  examples/examples.pro                          |    2 +-
+ examples/itemviews/itemviews.pro               |    4 +++-
+ examples/mainwindows/mainwindows.pro           |    1 +
  examples/tutorials/tutorials.pro               |    1 +
- 3 files changed, 3 insertions(+), 1 deletions(-)
+ 5 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
 index b811e44..7748da0 100644
@@ -25,7 +27,7 @@ index b811e44..7748da0 100644
      stringlistmodel
  
 diff --git a/examples/examples.pro b/examples/examples.pro
-index ead2214..fe681ed 100644
+index ed7db9c..8bdea85 100644
 --- a/examples/examples.pro
 +++ b/examples/examples.pro
 @@ -70,7 +70,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative
@@ -37,8 +39,41 @@ index ead2214..fe681ed 100644
  
  # install
  sources.files = README *.pro
+diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
+index 137599c..547694d 100644
+--- a/examples/itemviews/itemviews.pro
++++ b/examples/itemviews/itemviews.pro
+@@ -2,6 +2,7 @@ TEMPLATE      = subdirs
+ SUBDIRS       = addressbook \
+                 basicsortfiltermodel \
+                 chart \
++                coloreditorfactory \
+                 combowidgetmapper \
+                 customsortfiltermodel \
+                 dirview \
+@@ -13,7 +14,8 @@ SUBDIRS       = addressbook \
+                 simpledommodel \
+                 simpletreemodel \
+                 simplewidgetmapper \
+-                spinboxdelegate
++                spinboxdelegate \
++                stardelegate
+ 
+ # install
+ sources.files = README *.pro
+diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
+index 0b9b299..462327b 100644
+--- a/examples/mainwindows/mainwindows.pro
++++ b/examples/mainwindows/mainwindows.pro
+@@ -1,5 +1,6 @@
+ TEMPLATE      = subdirs
+ SUBDIRS       = application \
++                dockwidgets \
+                 mdi \
+                 menus \
+                 recentfiles \
 diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
-index 1b4667e..12adac4 100644
+index ba1769d..cb1ca6e 100644
 --- a/examples/tutorials/tutorials.pro
 +++ b/examples/tutorials/tutorials.pro
 @@ -1,5 +1,6 @@
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch
index 35f969413..35f969413 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0005-Fix-dnd-issue-on-QWS.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0007-qmake-make-sure-local-include-dirs-come-first.patch b/patches/qt-everywhere-opensource-src-4.8.0/0006-qmake-make-sure-local-include-dirs-come-first.patch
index 59ee9e6b5..283725177 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0007-qmake-make-sure-local-include-dirs-come-first.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0006-qmake-make-sure-local-include-dirs-come-first.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index bbddc5e..8087d3c 100644
+index 272f565..90c362f 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
-@@ -217,7 +217,7 @@ UnixMakefileGenerator::init()
+@@ -246,7 +246,7 @@ UnixMakefileGenerator::init()
              cflags += " $(CFLAGS)";
          else
              cflags += " $(" + comps[i] + "FLAGS)";
@@ -25,10 +25,10 @@ index bbddc5e..8087d3c 100644
          QString compiler = comps[i];
          if (compiler == "C")
 diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index 911b617..ae53c75 100644
+index fc951b1..0954a34 100644
 --- a/qmake/generators/unix/unixmake2.cpp
 +++ b/qmake/generators/unix/unixmake2.cpp
-@@ -978,7 +978,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -999,7 +999,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                  compiler = "$(CXX)";
  
              // compile command
diff --git a/patches/qt-everywhere-opensource-src-4.7.4/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch b/patches/qt-everywhere-opensource-src-4.8.0/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
index 2968ff91a..2968ff91a 100644
--- a/patches/qt-everywhere-opensource-src-4.7.4/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0008-don-t-build-webkit-tests.patch b/patches/qt-everywhere-opensource-src-4.8.0/0008-don-t-build-webkit-tests.patch
new file mode 100644
index 000000000..c50b85bcc
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.8.0/0008-don-t-build-webkit-tests.patch
@@ -0,0 +1,33 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 17 Oct 2011 19:34:55 +0200
+Subject: [PATCH] don't build webkit tests
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/3rdparty/webkit/Source/WebKit.pro |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/3rdparty/webkit/Source/WebKit.pro b/src/3rdparty/webkit/Source/WebKit.pro
+index 9be0f4a..eee88fe 100644
+--- a/src/3rdparty/webkit/Source/WebKit.pro
++++ b/src/3rdparty/webkit/Source/WebKit.pro
+@@ -15,19 +15,15 @@ SUBDIRS += WebKit/qt/QtWebKit.pro
+ 
+ webkit2 {
+     exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+-    exists($$PWD/WebKit2/UIProcess/API/qt/tests): SUBDIRS += WebKit2/UIProcess/API/qt/tests
+ }
+ 
+ contains(QT_CONFIG, declarative) {
+     exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+ }
+ 
+-exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+-
+ build-qtscript {
+     SUBDIRS += \
+         JavaScriptCore/qt/api/QtScript.pro \
+-        JavaScriptCore/qt/tests \
+         JavaScriptCore/qt/benchmarks
+ }
+ 
diff --git a/patches/qt-everywhere-opensource-src-4.8.0/series b/patches/qt-everywhere-opensource-src-4.8.0/series
new file mode 100644
index 000000000..a77b284b8
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.8.0/series
@@ -0,0 +1,11 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-mkspec-for-ptxdist.patch
+0002-disable-ordered-compiling.patch
+0003-Hack-hide-cursor-during-startup.patch
+0004-add-missing-subdirs.patch
+0005-Fix-dnd-issue-on-QWS.patch
+0006-qmake-make-sure-local-include-dirs-come-first.patch
+0007-phonon-fix-colors-for-video-on-qgraphicsview.patch
+0008-don-t-build-webkit-tests.patch
+# 8d5103d37d335eb55a93be1930c153b2  - git-ptx-patches magic
diff --git a/rules/qt4.in b/rules/qt4.in
index 4269a0e00..b690c832a 100644
--- a/rules/qt4.in
+++ b/rules/qt4.in
@@ -127,6 +127,28 @@ choice
 endchoice
 
 choice
+	prompt "eglnullws           "
+	default QT4_GFX_EGLNULLWS_NULL
+	help
+	  Accelerated driver using eglnullws
+
+	config QT4_GFX_EGLNULLWS_NULL
+		bool
+		prompt "none   "
+		help
+		  Don't build the driver
+
+# only as plugin
+
+	config QT4_GFX_EGLNULLWS_PLUGIN
+		bool
+		depends on QT4_BUILD_OPENGL
+		prompt "plugin "
+		help
+		  Load the driver at runtime
+endchoice
+
+choice
 	prompt "LinuxFb             "
 	default QT4_GFX_LINUXFB_NONE
 	help
@@ -616,7 +638,8 @@ config QT4_GIF_NONE
 	help
 	 This disables entirely any GIF support
 
-config QT4_GIF_INTERNAL
+config QT4_GIF_NULL
+	# note: NULL == no configure option. There is only -no-gif
 	bool "internal"
 	help
 	  This uses the embedded GIF support
diff --git a/rules/qt4.make b/rules/qt4.make
index e56c4e8cd..97725b63e 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4
 #
 # Paths and names
 #
-QT4_VERSION	:= 4.7.4
-QT4_MD5		:= 9831cf1dfa8d0689a06c2c54c5c65aaf
+QT4_VERSION	:= 4.8.0
+QT4_MD5		:= e8a5fdbeba2927c948d9f477a6abe904
 QT4		:= qt-everywhere-opensource-src-$(QT4_VERSION)
 QT4_SUFFIX	:= tar.gz
 QT4_URL		:= http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX)
@@ -136,6 +136,7 @@ QT4_AUTOCONF += \
 # graphics drivers
 QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_AHI)		+= gfx-ahi
 QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_DIRECTFB)	+= gfx-directfb
+QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_EGLNULLWS)	+= gfx-eglnullws
 QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_LINUXFB)		+= gfx-linuxfb
 QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_POWERVR)		+= gfx-powervr
 QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_SVGA)		+= gfx-svgalib
@@ -281,9 +282,6 @@ QT4_BUILD-$(PTXCONF_QT4_BUILD_QTXMLPATTERNS)	+= xmlpatterns
 QT4_BUILD-$(PTXCONF_QT4_BUILD_MULTIMEDIA)	+= multimedia
 QT4_BUILD-$(PTXCONF_QT4_BUILD_PHONON)		+= phonon
 QT4_BUILD-$(PTXCONF_QT4_BUILD_WEBKIT)		+= webkit script
-ifdef PTXCONF_QT4_BUILD_DECLARATIVE
-QT4_BUILD-$(PTXCONF_QT4_BUILD_WEBKIT)		+= webkitdeclarative
-endif
 QT4_BUILD-$(PTXCONF_QT4_BUILD_SCRIPTTOOLS)	+= scripttools
 # qmlviewer does not need xml but we cannot built sub-tools without it
 QT4_BUILD-$(PTXCONF_QT4_BUILD_TOOLS)		+= xml
@@ -366,6 +364,7 @@ QT4_IMAGEFORMATS-				+= svg
 endif
 
 QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_DIRECTFB)	+= directfbscreen
+QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_EGLNULLWS)	+= eglnullws
 QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_LINUXFB)	+= screenlinuxfb
 QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_POWERVR)	+= gfxpvregl
 QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_TRANSFORMED)	+= gfxtransformed