From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SFJcO-0007pu-Ur for ptxdist@pengutronix.de; Wed, 04 Apr 2012 08:22:56 +0200 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1SFJcO-0004H0-TU for ptxdist@pengutronix.de; Wed, 04 Apr 2012 08:22:56 +0200 Date: Wed, 4 Apr 2012 08:22:56 +0200 From: Michael Olbrich Message-ID: <20120404062256.GN28453@pengutronix.de> References: <1333009845-26592-1-git-send-email-bernhard@bwalle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1333009845-26592-1-git-send-email-bernhard@bwalle.de> Subject: Re: [ptxdist] [PATCH] qt4: version bump 4.8.0 -> 4.8.1 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Thu, Mar 29, 2012 at 10:30:45AM +0200, Bernhard Walle wrote: > From: Bernhard Walle > > Just a bugfix release. Thanks, applied. Michael > Signed-off-by: Bernhard Walle > --- > .../0001-mkspec-for-ptxdist.patch | 123 -------------------- > .../0002-disable-ordered-compiling.patch | 79 ------------- > .../0003-Hack-hide-cursor-during-startup.patch | 27 ----- > .../0004-add-missing-subdirs.patch | 85 -------------- > .../0005-Fix-dnd-issue-on-QWS.patch | 64 ---------- > ...e-make-sure-local-include-dirs-come-first.patch | 39 ------- > ...non-fix-colors-for-video-on-qgraphicsview.patch | 36 ------ > .../0008-don-t-build-webkit-tests.patch | 33 ------ > patches/qt-everywhere-opensource-src-4.8.0/series | 11 -- > .../0001-mkspec-for-ptxdist.patch | 123 ++++++++++++++++++++ > .../0002-disable-ordered-compiling.patch | 79 +++++++++++++ > .../0003-Hack-hide-cursor-during-startup.patch | 27 +++++ > .../0004-add-missing-subdirs.patch | 85 ++++++++++++++ > .../0005-Fix-dnd-issue-on-QWS.patch | 64 ++++++++++ > ...e-make-sure-local-include-dirs-come-first.patch | 39 +++++++ > ...non-fix-colors-for-video-on-qgraphicsview.patch | 36 ++++++ > .../0008-don-t-build-webkit-tests.patch | 33 ++++++ > patches/qt-everywhere-opensource-src-4.8.1/series | 11 ++ > rules/qt4.make | 4 +- > 19 files changed, 499 insertions(+), 499 deletions(-) > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0006-qmake-make-sure-local-include-dirs-come-first.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/0008-don-t-build-webkit-tests.patch > delete mode 100644 patches/qt-everywhere-opensource-src-4.8.0/series > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0001-mkspec-for-ptxdist.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0002-disable-ordered-compiling.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0003-Hack-hide-cursor-during-startup.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0004-add-missing-subdirs.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0005-Fix-dnd-issue-on-QWS.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0006-qmake-make-sure-local-include-dirs-come-first.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/0008-don-t-build-webkit-tests.patch > create mode 100644 patches/qt-everywhere-opensource-src-4.8.1/series > > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch > deleted file mode 100644 > index f018211..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0001-mkspec-for-ptxdist.patch > +++ /dev/null > @@ -1,123 +0,0 @@ > -From: Michael Olbrich > -Date: Fri, 8 Oct 2010 20:13:39 +0200 > -Subject: [PATCH] mkspec for ptxdist > - > -Add a mkspec for ptxdist: > -- qplatformdefs.h > - Include the generic qplatformdefs.h > -- qmake.conf.in > - Used to generate qmake.conf with the correct toolchain. > - > -Signed-off-by: Michael Olbrich > ---- > - mkspecs/linux-ptx-g++/qmake.conf.in | 41 +++++++++++++++++++++++++++++ > - mkspecs/linux-ptx-g++/qplatformdefs.h | 2 + > - mkspecs/qws/linux-ptx-g++/qmake.conf.in | 32 ++++++++++++++++++++++ > - mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + > - 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 > - create mode 100644 mkspecs/qws/linux-ptx-g++/qplatformdefs.h > - > -diff --git a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in > -new file mode 100644 > -index 0000000..c3e0150 > ---- /dev/null > -+++ b/mkspecs/linux-ptx-g++/qmake.conf.in > -@@ -0,0 +1,41 @@ > -+# > -+# qmake configuration for linux-ptx-g++ > -+# > -+ > -+ > -+include(../common/gcc-base-unix.conf) > -+include(../common/g++-unix.conf) > -+include(../common/linux.conf) > -+ > -+MAKEFILE_GENERATOR = UNIX > -+TEMPLATE = app > -+CONFIG += qt warn_on release incremental link_prl > -+QT += core gui network > -+QMAKE_INCREMENTAL_STYLE = sublib > -+ > -+# modifications to g++.conf > -+QMAKE_CC = @COMPILER_PREFIX@gcc > -+QMAKE_CFLAGS = -pipe @CPPFLAGS@ @CFLAGS@ > -+QMAKE_CXX = @COMPILER_PREFIX@g++ > -+QMAKE_CXXFLAGS = -pipe @CPPFLAGS@ @CXXFLAGS@ > -+QMAKE_INCDIR = @INCDIR@ > -+QMAKE_LIBDIR = @LIBDIR@ > -+ > -+QMAKE_LINK = @COMPILER_PREFIX@g++ > -+QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ > -+QMAKE_LFLAGS = @LDFLAGS@ > -+ > -+QMAKE_INCDIR_X11 = > -+QMAKE_LIBDIR_X11 = > -+QMAKE_INCDIR_OPENGL = > -+QMAKE_LIBDIR_OPENGL = > -+QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ > -+QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ > -+QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ > -+ > -+# modifications to linux.conf > -+QMAKE_AR = @COMPILER_PREFIX@ar cqs > -+QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy > -+QMAKE_STRIP = @COMPILER_PREFIX@strip > -+ > -+load(qt_config) > -diff --git a/mkspecs/linux-ptx-g++/qplatformdefs.h b/mkspecs/linux-ptx-g++/qplatformdefs.h > -new file mode 100644 > -index 0000000..05c77d1 > ---- /dev/null > -+++ b/mkspecs/linux-ptx-g++/qplatformdefs.h > -@@ -0,0 +1,2 @@ > -+ > -+#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..b52d5e7 > ---- /dev/null > -+++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in > -@@ -0,0 +1,32 @@ > -+# > -+# qmake configuration for linux-ptx-g++ > -+# > -+ > -+ > -+include(../../common/gcc-base-unix.conf) > -+include(../../common/g++-unix.conf) > -+include(../../common/linux.conf) > -+include(../../common/qws.conf) > -+ > -+# modifications to g++.conf > -+QMAKE_CC = @COMPILER_PREFIX@gcc > -+QMAKE_CFLAGS = -pipe @CPPFLAGS@ @CFLAGS@ > -+QMAKE_CXX = @COMPILER_PREFIX@g++ > -+QMAKE_CXXFLAGS = -pipe @CPPFLAGS@ @CXXFLAGS@ > -+QMAKE_INCDIR = @INCDIR@ > -+QMAKE_LIBDIR = @LIBDIR@ > -+ > -+QMAKE_LINK = @COMPILER_PREFIX@g++ > -+QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ > -+QMAKE_LFLAGS = @LDFLAGS@ > -+ > -+QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ > -+QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ > -+QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ > -+ > -+# modifications to linux.conf > -+QMAKE_AR = @COMPILER_PREFIX@ar cqs > -+QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy > -+QMAKE_STRIP = @COMPILER_PREFIX@strip > -+ > -+load(qt_config) > -diff --git a/mkspecs/qws/linux-ptx-g++/qplatformdefs.h b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h > -new file mode 100644 > -index 0000000..e10ebcf > ---- /dev/null > -+++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h > -@@ -0,0 +1,2 @@ > -+ > -+#include "../../linux-g++/qplatformdefs.h" > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch > deleted file mode 100644 > index b70d7e4..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0002-disable-ordered-compiling.patch > +++ /dev/null > @@ -1,79 +0,0 @@ > -From: Michael Olbrich > -Date: Fri, 8 Oct 2010 20:13:40 +0200 > -Subject: [PATCH] disable ordered compiling. > - > -By default all modules are compiled in a predefined order. This breaks when > -building not all modules. This patch disables ordered building. As a result > -qmake generates the correct dependancies. > - > -Signed-off-by: Michael Olbrich > ---- > - examples/examples.pro | 4 ++++ > - projects.pro | 1 - > - src/src.pro | 8 ++++++-- > - 3 files changed, 10 insertions(+), 3 deletions(-) > - > -diff --git a/examples/examples.pro b/examples/examples.pro > -index cf12dd6..ed7db9c 100644 > ---- a/examples/examples.pro > -+++ b/examples/examples.pro > -@@ -49,6 +49,10 @@ symbian: SUBDIRS = \ > - SUBDIRS += multimedia > - } > - > -+contains(QT_CONFIG, webkit) { > -+ SUBDIRS += webkit > -+} > -+ > - contains(QT_CONFIG, script): SUBDIRS += script > - > - contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon > -diff --git a/projects.pro b/projects.pro > -index bf4dc5e..f095f0d 100644 > ---- a/projects.pro > -+++ b/projects.pro > -@@ -2,7 +2,6 @@ > - # Main projectfile > - ##################################################################### > - > --CONFIG += ordered > - TEMPLATE = subdirs > - > - cross_compile: CONFIG += nostrip > -diff --git a/src/src.pro b/src/src.pro > -index 9314fbd..3f528ee 100644 > ---- a/src/src.pro > -+++ b/src/src.pro > -@@ -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 > -- src_phonon.depends = src_gui > -+ src_phonon.depends = src_gui src_network > - src_multimedia.depends = src_gui > - contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl > - src_activeqt.depends = src_tools_idc src_gui > - src_declarative.depends = src_gui src_script src_network > -- src_plugins.depends = src_gui src_sql src_svg > -+ 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 > -@@ -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 > - } > - 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, declarative):src_plugins.depends += src_declarative > -+ contains(QT_CONFIG, phonon):src_plugins.depends += src_phonon > - } > - > - > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch > deleted file mode 100644 > index 5fe3a10..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0003-Hack-hide-cursor-during-startup.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From: Michael Olbrich > -Date: Fri, 8 Oct 2010 20:13:40 +0200 > -Subject: [PATCH] Hack: hide cursor during startup > - > -This will hide the cursor during application startup. > -To keep it hidden the application must call > -QApplication::setOverrideCursor(Qt::BlankCursor); > -Otherwise the cursor returns when the mouse is moved. > - > -Signed-off-by: Michael Olbrich > ---- > - src/gui/embedded/qwscursor_qws.cpp | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp > -index 9e8c235..0ff0dc3 100644 > ---- a/src/gui/embedded/qwscursor_qws.cpp > -+++ b/src/gui/embedded/qwscursor_qws.cpp > -@@ -344,7 +344,7 @@ void QWSServerPrivate::initializeCursor() > - > - // default cursor > - cursor = 0; > -- setCursor(QWSCursor::systemCursor(Qt::ArrowCursor)); > -+ setCursor(QWSCursor::systemCursor(Qt::BlankCursor)); > - #endif > - q->sendMouseEvent(QPoint(swidth/2, sheight/2), 0); > - } > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch > deleted file mode 100644 > index 6a324f0..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0004-add-missing-subdirs.patch > +++ /dev/null > @@ -1,85 +0,0 @@ > -From: Michael Olbrich > -Date: Fri, 8 Oct 2010 20:13:40 +0200 > -Subject: [PATCH] add missing subdirs > - > -SUBDIRS is not set correctly in several places in examples > -This patch fixes it. > - > -Signed-off-by: Michael Olbrich > ---- > - 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 + > - 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 > ---- a/examples/declarative/modelviews/modelviews.pro > -+++ b/examples/declarative/modelviews/modelviews.pro > -@@ -1,6 +1,7 @@ > - TEMPLATE = subdirs > - > - SUBDIRS += \ > -+ abstractitemmodel \ > - objectlistmodel \ > - stringlistmodel > - > -diff --git a/examples/examples.pro b/examples/examples.pro > -index ed7db9c..8bdea85 100644 > ---- a/examples/examples.pro > -+++ b/examples/examples.pro > -@@ -70,7 +70,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative > - win32: SUBDIRS += activeqt > - contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns > - contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows > --contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent > -+!contains(DEFINES, QT_NO_CONCURRENT): SUBDIRS += qtconcurrent > - > - # 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 ba1769d..cb1ca6e 100644 > ---- a/examples/tutorials/tutorials.pro > -+++ b/examples/tutorials/tutorials.pro > -@@ -1,5 +1,6 @@ > - TEMPLATE = subdirs > - SUBDIRS = \ > -+ widgets \ > - addressbook \ > - modelview \ > - threads > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch > deleted file mode 100644 > index 35f9694..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0005-Fix-dnd-issue-on-QWS.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From: Michael Olbrich > -Date: Fri, 8 Oct 2010 20:13:40 +0200 > -Subject: [PATCH] Fix dnd issue on QWS > - > -An overrideCursor set in the application can be messed up by > -dnd stuff. As a result, the cursor gets stuck at Qt::ForbiddenCursor > -This patch seems to fix it, but I'm not sure if it breaks anything. > - > -Signed-off-by: Michael Olbrich > ---- > - src/gui/kernel/qdnd_qws.cpp | 9 +++------ > - 1 files changed, 3 insertions(+), 6 deletions(-) > - > -diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp > -index 96bdaed..5582404 100644 > ---- a/src/gui/kernel/qdnd_qws.cpp > -+++ b/src/gui/kernel/qdnd_qws.cpp > -@@ -162,10 +162,10 @@ void QDragManager::updateCursor() > - } > - } else { > - QCursor *overrideCursor = QApplication::overrideCursor(); > -- if (!overrideCursor || overrideCursor->shape() != Qt::ForbiddenCursor) { > -+ if (restoreCursor && (!overrideCursor || overrideCursor->shape() != Qt::ForbiddenCursor)) { > - QApplication::changeOverrideCursor(QCursor(Qt::ForbiddenCursor)); > -- currentActionForOverrideCursor = Qt::IgnoreAction; > - } > -+ currentActionForOverrideCursor = Qt::IgnoreAction; > - if (qt_qws_dnd_deco) > - qt_qws_dnd_deco->hide(); > - } > -@@ -246,7 +246,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > - willDrop = false; > - global_accepted_action = Qt::IgnoreAction; > - updateCursor(); > -- restoreCursor = true; > - object->d_func()->target = 0; > - } > - if (cw && cw->acceptDrops()) { > -@@ -257,7 +256,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > - willDrop = dee.isAccepted() && dee.dropAction() != Qt::IgnoreAction; > - global_accepted_action = willDrop ? dee.dropAction() : Qt::IgnoreAction; > - updateCursor(); > -- restoreCursor = true; > - } > - } else if (cw) { > - QDragMoveEvent dme(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData, > -@@ -281,8 +279,8 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > - case QEvent::MouseButtonRelease: > - { > - qApp->removeEventFilter(this); > -+ willDrop = false; > - if (restoreCursor) { > -- willDrop = false; > - #ifndef QT_NO_CURSOR > - QApplication::restoreOverrideCursor(); > - #endif > -@@ -336,7 +334,6 @@ Qt::DropAction QDragManager::drag(QDrag *o) > - willDrop = false; > - updatePixmap(); > - updateCursor(); > -- restoreCursor = true; > - object->d_func()->target = 0; > - qApp->installEventFilter(this); > - > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0006-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 > deleted file mode 100644 > index 2837251..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0006-qmake-make-sure-local-include-dirs-come-first.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From: Michael Olbrich > -Date: Wed, 2 Feb 2011 18:00:51 +0100 > -Subject: [PATCH] qmake: make sure local include dirs come first. > - > -This fixes the issue where a pcre.h from a include path from > -CXXFLAGS is used instead of the one in webkit. > - > -Signed-off-by: Michael Olbrich > ---- > - qmake/generators/unix/unixmake.cpp | 2 +- > - qmake/generators/unix/unixmake2.cpp | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp > -index 272f565..90c362f 100644 > ---- a/qmake/generators/unix/unixmake.cpp > -+++ b/qmake/generators/unix/unixmake.cpp > -@@ -246,7 +246,7 @@ UnixMakefileGenerator::init() > - cflags += " $(CFLAGS)"; > - else > - cflags += " $(" + comps[i] + "FLAGS)"; > -- compile_flag += cflags + " $(INCPATH)"; > -+ compile_flag += " $(INCPATH)" + cflags; > - > - QString compiler = comps[i]; > - if (compiler == "C") > -diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp > -index fc951b1..0954a34 100644 > ---- a/qmake/generators/unix/unixmake2.cpp > -+++ b/qmake/generators/unix/unixmake2.cpp > -@@ -999,7 +999,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) > - compiler = "$(CXX)"; > - > - // compile command > -- t << "\n\t" << compiler << cflags << " $(INCPATH) " << pchFlags << endl << endl; > -+ t << "\n\t" << compiler << " $(INCPATH) " << cflags << " " << pchFlags << endl << endl; > - } > - } > - > diff --git a/patches/qt-everywhere-opensource-src-4.8.0/0007-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 > deleted file mode 100644 > index 2968ff9..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From: Michael Olbrich > -Date: Thu, 3 Feb 2011 11:24:22 +0100 > -Subject: [PATCH] phonon: fix colors for video on qgraphicsview > - > -patch from http://bugreports.qt.nokia.com/browse/QTBUG-8737 > - > -Signed-off-by: Michael Olbrich > ---- > - src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp | 7 ++----- > - 1 files changed, 2 insertions(+), 5 deletions(-) > - > -diff --git a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > -index 89d5a9d..8508001 100644 > ---- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > -+++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > -@@ -18,6 +18,7 @@ > - #include > - #include "videowidget.h" > - #include "qwidgetvideosink.h" > -+#include > - > - QT_BEGIN_NAMESPACE > - > -@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb = > - GST_STATIC_PAD_TEMPLATE("sink", > - GST_PAD_SINK, > - GST_PAD_ALWAYS, > -- GST_STATIC_CAPS("video/x-raw-rgb, " > -- "framerate = (fraction) [ 0, MAX ], " > -- "width = (int) [ 1, MAX ], " > -- "height = (int) [ 1, MAX ]," > -- "bpp = (int) 32")); > -+ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN)); > - > - template > - struct template_factory; > 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 > deleted file mode 100644 > index c50b85b..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/0008-don-t-build-webkit-tests.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From: Michael Olbrich > -Date: Mon, 17 Oct 2011 19:34:55 +0200 > -Subject: [PATCH] don't build webkit tests > - > -Signed-off-by: Michael Olbrich > ---- > - 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 > deleted file mode 100644 > index a77b284..0000000 > --- a/patches/qt-everywhere-opensource-src-4.8.0/series > +++ /dev/null > @@ -1,11 +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-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/patches/qt-everywhere-opensource-src-4.8.1/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.8.1/0001-mkspec-for-ptxdist.patch > new file mode 100644 > index 0000000..f018211 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0001-mkspec-for-ptxdist.patch > @@ -0,0 +1,123 @@ > +From: Michael Olbrich > +Date: Fri, 8 Oct 2010 20:13:39 +0200 > +Subject: [PATCH] mkspec for ptxdist > + > +Add a mkspec for ptxdist: > +- qplatformdefs.h > + Include the generic qplatformdefs.h > +- qmake.conf.in > + Used to generate qmake.conf with the correct toolchain. > + > +Signed-off-by: Michael Olbrich > +--- > + mkspecs/linux-ptx-g++/qmake.conf.in | 41 +++++++++++++++++++++++++++++ > + mkspecs/linux-ptx-g++/qplatformdefs.h | 2 + > + mkspecs/qws/linux-ptx-g++/qmake.conf.in | 32 ++++++++++++++++++++++ > + mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + > + 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 > + create mode 100644 mkspecs/qws/linux-ptx-g++/qplatformdefs.h > + > +diff --git a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in > +new file mode 100644 > +index 0000000..c3e0150 > +--- /dev/null > ++++ b/mkspecs/linux-ptx-g++/qmake.conf.in > +@@ -0,0 +1,41 @@ > ++# > ++# qmake configuration for linux-ptx-g++ > ++# > ++ > ++ > ++include(../common/gcc-base-unix.conf) > ++include(../common/g++-unix.conf) > ++include(../common/linux.conf) > ++ > ++MAKEFILE_GENERATOR = UNIX > ++TEMPLATE = app > ++CONFIG += qt warn_on release incremental link_prl > ++QT += core gui network > ++QMAKE_INCREMENTAL_STYLE = sublib > ++ > ++# modifications to g++.conf > ++QMAKE_CC = @COMPILER_PREFIX@gcc > ++QMAKE_CFLAGS = -pipe @CPPFLAGS@ @CFLAGS@ > ++QMAKE_CXX = @COMPILER_PREFIX@g++ > ++QMAKE_CXXFLAGS = -pipe @CPPFLAGS@ @CXXFLAGS@ > ++QMAKE_INCDIR = @INCDIR@ > ++QMAKE_LIBDIR = @LIBDIR@ > ++ > ++QMAKE_LINK = @COMPILER_PREFIX@g++ > ++QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ > ++QMAKE_LFLAGS = @LDFLAGS@ > ++ > ++QMAKE_INCDIR_X11 = > ++QMAKE_LIBDIR_X11 = > ++QMAKE_INCDIR_OPENGL = > ++QMAKE_LIBDIR_OPENGL = > ++QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ > ++QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ > ++QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ > ++ > ++# modifications to linux.conf > ++QMAKE_AR = @COMPILER_PREFIX@ar cqs > ++QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy > ++QMAKE_STRIP = @COMPILER_PREFIX@strip > ++ > ++load(qt_config) > +diff --git a/mkspecs/linux-ptx-g++/qplatformdefs.h b/mkspecs/linux-ptx-g++/qplatformdefs.h > +new file mode 100644 > +index 0000000..05c77d1 > +--- /dev/null > ++++ b/mkspecs/linux-ptx-g++/qplatformdefs.h > +@@ -0,0 +1,2 @@ > ++ > ++#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..b52d5e7 > +--- /dev/null > ++++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in > +@@ -0,0 +1,32 @@ > ++# > ++# qmake configuration for linux-ptx-g++ > ++# > ++ > ++ > ++include(../../common/gcc-base-unix.conf) > ++include(../../common/g++-unix.conf) > ++include(../../common/linux.conf) > ++include(../../common/qws.conf) > ++ > ++# modifications to g++.conf > ++QMAKE_CC = @COMPILER_PREFIX@gcc > ++QMAKE_CFLAGS = -pipe @CPPFLAGS@ @CFLAGS@ > ++QMAKE_CXX = @COMPILER_PREFIX@g++ > ++QMAKE_CXXFLAGS = -pipe @CPPFLAGS@ @CXXFLAGS@ > ++QMAKE_INCDIR = @INCDIR@ > ++QMAKE_LIBDIR = @LIBDIR@ > ++ > ++QMAKE_LINK = @COMPILER_PREFIX@g++ > ++QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ > ++QMAKE_LFLAGS = @LDFLAGS@ > ++ > ++QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ > ++QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ > ++QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ > ++ > ++# modifications to linux.conf > ++QMAKE_AR = @COMPILER_PREFIX@ar cqs > ++QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy > ++QMAKE_STRIP = @COMPILER_PREFIX@strip > ++ > ++load(qt_config) > +diff --git a/mkspecs/qws/linux-ptx-g++/qplatformdefs.h b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h > +new file mode 100644 > +index 0000000..e10ebcf > +--- /dev/null > ++++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h > +@@ -0,0 +1,2 @@ > ++ > ++#include "../../linux-g++/qplatformdefs.h" > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.8.1/0002-disable-ordered-compiling.patch > new file mode 100644 > index 0000000..b70d7e4 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0002-disable-ordered-compiling.patch > @@ -0,0 +1,79 @@ > +From: Michael Olbrich > +Date: Fri, 8 Oct 2010 20:13:40 +0200 > +Subject: [PATCH] disable ordered compiling. > + > +By default all modules are compiled in a predefined order. This breaks when > +building not all modules. This patch disables ordered building. As a result > +qmake generates the correct dependancies. > + > +Signed-off-by: Michael Olbrich > +--- > + examples/examples.pro | 4 ++++ > + projects.pro | 1 - > + src/src.pro | 8 ++++++-- > + 3 files changed, 10 insertions(+), 3 deletions(-) > + > +diff --git a/examples/examples.pro b/examples/examples.pro > +index cf12dd6..ed7db9c 100644 > +--- a/examples/examples.pro > ++++ b/examples/examples.pro > +@@ -49,6 +49,10 @@ symbian: SUBDIRS = \ > + SUBDIRS += multimedia > + } > + > ++contains(QT_CONFIG, webkit) { > ++ SUBDIRS += webkit > ++} > ++ > + contains(QT_CONFIG, script): SUBDIRS += script > + > + contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon > +diff --git a/projects.pro b/projects.pro > +index bf4dc5e..f095f0d 100644 > +--- a/projects.pro > ++++ b/projects.pro > +@@ -2,7 +2,6 @@ > + # Main projectfile > + ##################################################################### > + > +-CONFIG += ordered > + TEMPLATE = subdirs > + > + cross_compile: CONFIG += nostrip > +diff --git a/src/src.pro b/src/src.pro > +index 9314fbd..3f528ee 100644 > +--- a/src/src.pro > ++++ b/src/src.pro > +@@ -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 > +- src_phonon.depends = src_gui > ++ src_phonon.depends = src_gui src_network > + src_multimedia.depends = src_gui > + contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl > + src_activeqt.depends = src_tools_idc src_gui > + src_declarative.depends = src_gui src_script src_network > +- src_plugins.depends = src_gui src_sql src_svg > ++ 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 > +@@ -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 > + } > + 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, declarative):src_plugins.depends += src_declarative > ++ contains(QT_CONFIG, phonon):src_plugins.depends += src_phonon > + } > + > + > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.8.1/0003-Hack-hide-cursor-during-startup.patch > new file mode 100644 > index 0000000..5fe3a10 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0003-Hack-hide-cursor-during-startup.patch > @@ -0,0 +1,27 @@ > +From: Michael Olbrich > +Date: Fri, 8 Oct 2010 20:13:40 +0200 > +Subject: [PATCH] Hack: hide cursor during startup > + > +This will hide the cursor during application startup. > +To keep it hidden the application must call > +QApplication::setOverrideCursor(Qt::BlankCursor); > +Otherwise the cursor returns when the mouse is moved. > + > +Signed-off-by: Michael Olbrich > +--- > + src/gui/embedded/qwscursor_qws.cpp | 2 +- > + 1 files changed, 1 insertions(+), 1 deletions(-) > + > +diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp > +index 9e8c235..0ff0dc3 100644 > +--- a/src/gui/embedded/qwscursor_qws.cpp > ++++ b/src/gui/embedded/qwscursor_qws.cpp > +@@ -344,7 +344,7 @@ void QWSServerPrivate::initializeCursor() > + > + // default cursor > + cursor = 0; > +- setCursor(QWSCursor::systemCursor(Qt::ArrowCursor)); > ++ setCursor(QWSCursor::systemCursor(Qt::BlankCursor)); > + #endif > + q->sendMouseEvent(QPoint(swidth/2, sheight/2), 0); > + } > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.8.1/0004-add-missing-subdirs.patch > new file mode 100644 > index 0000000..6a324f0 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0004-add-missing-subdirs.patch > @@ -0,0 +1,85 @@ > +From: Michael Olbrich > +Date: Fri, 8 Oct 2010 20:13:40 +0200 > +Subject: [PATCH] add missing subdirs > + > +SUBDIRS is not set correctly in several places in examples > +This patch fixes it. > + > +Signed-off-by: Michael Olbrich > +--- > + 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 + > + 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 > +--- a/examples/declarative/modelviews/modelviews.pro > ++++ b/examples/declarative/modelviews/modelviews.pro > +@@ -1,6 +1,7 @@ > + TEMPLATE = subdirs > + > + SUBDIRS += \ > ++ abstractitemmodel \ > + objectlistmodel \ > + stringlistmodel > + > +diff --git a/examples/examples.pro b/examples/examples.pro > +index ed7db9c..8bdea85 100644 > +--- a/examples/examples.pro > ++++ b/examples/examples.pro > +@@ -70,7 +70,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative > + win32: SUBDIRS += activeqt > + contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns > + contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows > +-contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent > ++!contains(DEFINES, QT_NO_CONCURRENT): SUBDIRS += qtconcurrent > + > + # 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 ba1769d..cb1ca6e 100644 > +--- a/examples/tutorials/tutorials.pro > ++++ b/examples/tutorials/tutorials.pro > +@@ -1,5 +1,6 @@ > + TEMPLATE = subdirs > + SUBDIRS = \ > ++ widgets \ > + addressbook \ > + modelview \ > + threads > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.8.1/0005-Fix-dnd-issue-on-QWS.patch > new file mode 100644 > index 0000000..35f9694 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0005-Fix-dnd-issue-on-QWS.patch > @@ -0,0 +1,64 @@ > +From: Michael Olbrich > +Date: Fri, 8 Oct 2010 20:13:40 +0200 > +Subject: [PATCH] Fix dnd issue on QWS > + > +An overrideCursor set in the application can be messed up by > +dnd stuff. As a result, the cursor gets stuck at Qt::ForbiddenCursor > +This patch seems to fix it, but I'm not sure if it breaks anything. > + > +Signed-off-by: Michael Olbrich > +--- > + src/gui/kernel/qdnd_qws.cpp | 9 +++------ > + 1 files changed, 3 insertions(+), 6 deletions(-) > + > +diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp > +index 96bdaed..5582404 100644 > +--- a/src/gui/kernel/qdnd_qws.cpp > ++++ b/src/gui/kernel/qdnd_qws.cpp > +@@ -162,10 +162,10 @@ void QDragManager::updateCursor() > + } > + } else { > + QCursor *overrideCursor = QApplication::overrideCursor(); > +- if (!overrideCursor || overrideCursor->shape() != Qt::ForbiddenCursor) { > ++ if (restoreCursor && (!overrideCursor || overrideCursor->shape() != Qt::ForbiddenCursor)) { > + QApplication::changeOverrideCursor(QCursor(Qt::ForbiddenCursor)); > +- currentActionForOverrideCursor = Qt::IgnoreAction; > + } > ++ currentActionForOverrideCursor = Qt::IgnoreAction; > + if (qt_qws_dnd_deco) > + qt_qws_dnd_deco->hide(); > + } > +@@ -246,7 +246,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > + willDrop = false; > + global_accepted_action = Qt::IgnoreAction; > + updateCursor(); > +- restoreCursor = true; > + object->d_func()->target = 0; > + } > + if (cw && cw->acceptDrops()) { > +@@ -257,7 +256,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > + willDrop = dee.isAccepted() && dee.dropAction() != Qt::IgnoreAction; > + global_accepted_action = willDrop ? dee.dropAction() : Qt::IgnoreAction; > + updateCursor(); > +- restoreCursor = true; > + } > + } else if (cw) { > + QDragMoveEvent dme(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData, > +@@ -281,8 +279,8 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e) > + case QEvent::MouseButtonRelease: > + { > + qApp->removeEventFilter(this); > ++ willDrop = false; > + if (restoreCursor) { > +- willDrop = false; > + #ifndef QT_NO_CURSOR > + QApplication::restoreOverrideCursor(); > + #endif > +@@ -336,7 +334,6 @@ Qt::DropAction QDragManager::drag(QDrag *o) > + willDrop = false; > + updatePixmap(); > + updateCursor(); > +- restoreCursor = true; > + object->d_func()->target = 0; > + qApp->installEventFilter(this); > + > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0006-qmake-make-sure-local-include-dirs-come-first.patch b/patches/qt-everywhere-opensource-src-4.8.1/0006-qmake-make-sure-local-include-dirs-come-first.patch > new file mode 100644 > index 0000000..2837251 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0006-qmake-make-sure-local-include-dirs-come-first.patch > @@ -0,0 +1,39 @@ > +From: Michael Olbrich > +Date: Wed, 2 Feb 2011 18:00:51 +0100 > +Subject: [PATCH] qmake: make sure local include dirs come first. > + > +This fixes the issue where a pcre.h from a include path from > +CXXFLAGS is used instead of the one in webkit. > + > +Signed-off-by: Michael Olbrich > +--- > + qmake/generators/unix/unixmake.cpp | 2 +- > + qmake/generators/unix/unixmake2.cpp | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp > +index 272f565..90c362f 100644 > +--- a/qmake/generators/unix/unixmake.cpp > ++++ b/qmake/generators/unix/unixmake.cpp > +@@ -246,7 +246,7 @@ UnixMakefileGenerator::init() > + cflags += " $(CFLAGS)"; > + else > + cflags += " $(" + comps[i] + "FLAGS)"; > +- compile_flag += cflags + " $(INCPATH)"; > ++ compile_flag += " $(INCPATH)" + cflags; > + > + QString compiler = comps[i]; > + if (compiler == "C") > +diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp > +index fc951b1..0954a34 100644 > +--- a/qmake/generators/unix/unixmake2.cpp > ++++ b/qmake/generators/unix/unixmake2.cpp > +@@ -999,7 +999,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) > + compiler = "$(CXX)"; > + > + // compile command > +- t << "\n\t" << compiler << cflags << " $(INCPATH) " << pchFlags << endl << endl; > ++ t << "\n\t" << compiler << " $(INCPATH) " << cflags << " " << pchFlags << endl << endl; > + } > + } > + > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch b/patches/qt-everywhere-opensource-src-4.8.1/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch > new file mode 100644 > index 0000000..2968ff9 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0007-phonon-fix-colors-for-video-on-qgraphicsview.patch > @@ -0,0 +1,36 @@ > +From: Michael Olbrich > +Date: Thu, 3 Feb 2011 11:24:22 +0100 > +Subject: [PATCH] phonon: fix colors for video on qgraphicsview > + > +patch from http://bugreports.qt.nokia.com/browse/QTBUG-8737 > + > +Signed-off-by: Michael Olbrich > +--- > + src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp | 7 ++----- > + 1 files changed, 2 insertions(+), 5 deletions(-) > + > +diff --git a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > +index 89d5a9d..8508001 100644 > +--- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > ++++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp > +@@ -18,6 +18,7 @@ > + #include > + #include "videowidget.h" > + #include "qwidgetvideosink.h" > ++#include > + > + QT_BEGIN_NAMESPACE > + > +@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb = > + GST_STATIC_PAD_TEMPLATE("sink", > + GST_PAD_SINK, > + GST_PAD_ALWAYS, > +- GST_STATIC_CAPS("video/x-raw-rgb, " > +- "framerate = (fraction) [ 0, MAX ], " > +- "width = (int) [ 1, MAX ], " > +- "height = (int) [ 1, MAX ]," > +- "bpp = (int) 32")); > ++ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN)); > + > + template > + struct template_factory; > diff --git a/patches/qt-everywhere-opensource-src-4.8.1/0008-don-t-build-webkit-tests.patch b/patches/qt-everywhere-opensource-src-4.8.1/0008-don-t-build-webkit-tests.patch > new file mode 100644 > index 0000000..c50b85b > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/0008-don-t-build-webkit-tests.patch > @@ -0,0 +1,33 @@ > +From: Michael Olbrich > +Date: Mon, 17 Oct 2011 19:34:55 +0200 > +Subject: [PATCH] don't build webkit tests > + > +Signed-off-by: Michael Olbrich > +--- > + 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.1/series b/patches/qt-everywhere-opensource-src-4.8.1/series > new file mode 100644 > index 0000000..a77b284 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-4.8.1/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.make b/rules/qt4.make > index 97725b6..fe5eb59 100644 > --- a/rules/qt4.make > +++ b/rules/qt4.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4 > # > # Paths and names > # > -QT4_VERSION := 4.8.0 > -QT4_MD5 := e8a5fdbeba2927c948d9f477a6abe904 > +QT4_VERSION := 4.8.1 > +QT4_MD5 := 7960ba8e18ca31f0c6e4895a312f92ff > QT4 := qt-everywhere-opensource-src-$(QT4_VERSION) > QT4_SUFFIX := tar.gz > QT4_URL := http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX) > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de