summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-13 19:44:58 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-13 19:44:58 +0200
commitf9be03e6743d19e5fc119a8610496cff05d8c1b3 (patch)
treedf3cf6c3195d75532ffccf0923d7d764becdb26d
parent6f401cc9e424f00634f89f832520c85d08daabf1 (diff)
downloadptxdist-f9be03e6743d19e5fc119a8610496cff05d8c1b3.tar.gz
ptxdist-f9be03e6743d19e5fc119a8610496cff05d8c1b3.tar.xz
qt4: version bump 4.6.3 -> 4.7.3
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch56
-rw-r--r--patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch27
-rw-r--r--patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch49
-rw-r--r--patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch28
-rw-r--r--patches/qt-everywhere-opensource-src-4.6.3/series12
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch)3
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch81
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0003-Hack-hide-cursor-during-startup.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch)7
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch50
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0005-Fix-dnd-issue-on-QWS.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch)15
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0006-Hack-disable-Wl-gc-sections-on-ppc.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch)17
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0007-qmake-make-sure-local-include-dirs-come-first.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch)11
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch (renamed from patches/qt-everywhere-opensource-src-4.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch)3
-rw-r--r--patches/qt-everywhere-opensource-src-4.7.3/series10
-rw-r--r--rules/host-qt4.make2
-rw-r--r--rules/qt4.in36
-rw-r--r--rules/qt4.make72
17 files changed, 251 insertions, 228 deletions
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch
deleted file mode 100644
index a5975b738..000000000
--- a/patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:52 +0100
-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 <m.olbrich@pengutronix.de>
----
- projects.pro | 1 -
- src/src.pro | 6 ++++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/projects.pro b/projects.pro
-index c9e77cb..6a63e09 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 f2070ae..d663c60 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -98,11 +98,12 @@ 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
- src_tools_activeqt.depends = src_tools_idc src_gui
- src_declarative.depends = src_xml src_gui src_script src_network src_svg
-- 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, webkit) {
- src_webkit.depends = src_gui src_sql src_network src_xml
- contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon
-@@ -116,6 +117,7 @@ src_declarative.target = sub-declarative
- src_phonon.depends += src_dbus
- }
- contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
-+ contains(QT_CONFIG, phonon):src_plugins.depends += src_phonon
- }
-
- !symbian {
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch b/patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch
deleted file mode 100644
index 03b7d9069..000000000
--- a/patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:52 +0100
-Subject: [PATCH] add missing subdir
-
-"widgets" is missing from SUBDIRS and wont be commpiled.
-
-This patch addes it.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- examples/tutorials/tutorials.pro | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
-index 949fdf6..89febd0 100644
---- a/examples/tutorials/tutorials.pro
-+++ b/examples/tutorials/tutorials.pro
-@@ -1,5 +1,6 @@
- TEMPLATE = subdirs
- SUBDIRS = \
-+ widgets \
- addressbook
-
- # install
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch b/patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch
deleted file mode 100644
index 848951d7f..000000000
--- a/patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:53 +0100
-Subject: [PATCH] fix zlib handling for host tools
-
-The host-tools build system is broken. It uses the zlib switch for the
-target to determine if the system or internal zlib should be used.
-This breaks if we select system zlib for the target and there is no zlib.h
-installed on the build system.
-It is also not possible to add aditional include paths for host tools.
-
-With this patch the host-tools always use the internal zlib when
-cross-compiling.
-Fixed upstream for Qt 4.7
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/tools/bootstrap/bootstrap.pri | 2 +-
- src/tools/bootstrap/bootstrap.pro | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
-index b3ee948..6442526 100644
---- a/src/tools/bootstrap/bootstrap.pri
-+++ b/src/tools/bootstrap/bootstrap.pri
-@@ -51,7 +51,7 @@ hpux-acc*|hpuxi-acc* {
- }
- LIBS += -lbootstrap
- }
--!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
-+!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
- unix:LIBS += -lz
- # win32:LIBS += libz.lib
- }
-diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index 0dbb90f..7e91333 100644
---- a/src/tools/bootstrap/bootstrap.pro
-+++ b/src/tools/bootstrap/bootstrap.pro
-@@ -95,7 +95,7 @@ macx: {
- LIBS += -framework CoreServices
- }
-
--contains(QT_CONFIG, zlib) {
-+contains(QT_CONFIG, zlib)|cross_compile {
- INCLUDEPATH += ../../3rdparty/zlib
- SOURCES+= \
- ../3rdparty/zlib/adler32.c \
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch b/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch
deleted file mode 100644
index 2ff882708..000000000
--- a/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Bernhard Walle <walle@corscience.de>
-Date: Mon, 9 May 2011 16:53:35 +0200
-Subject: [PATCH] Qualify ptrdiff_t's namespace in stltest configure test
-
-Originally from:
-https://qt.gitorious.org/qt/qt/commit/f1bbb1648a9770f37ca39b8d68d6bd269dd06250
-
-Signed-off-by: Bernhard Walle <walle@corscience.de>
----
- config.tests/unix/stl/stltest.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp
-index bfda2e3..191ec76 100644
---- a/config.tests/unix/stl/stltest.cpp
-+++ b/config.tests/unix/stl/stltest.cpp
-@@ -69,7 +69,7 @@ class DummyIterator
- public:
- T *i;
- typedef std::random_access_iterator_tag iterator_category;
-- typedef ptrdiff_t difference_type;
-+ typedef std::ptrdiff_t difference_type;
- typedef T value_type;
- typedef T *pointer;
- typedef T &reference;
---
-1.7.5.1
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/series b/patches/qt-everywhere-opensource-src-4.6.3/series
deleted file mode 100644
index fdd460f2c..000000000
--- a/patches/qt-everywhere-opensource-src-4.6.3/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-0001-mkspec-for-ptxdist.patch
-0002-disable-ordered-compiling.patch
-0003-Hack-hide-cursor-during-startup.patch
-0004-add-missing-subdir.patch
-0005-Fix-dnd-issue-on-QWS.patch
-0006-fix-zlib-handling-for-host-tools.patch
-0007-Hack-disable-Wl-gc-sections-on-ppc.patch
-0008-qmake-make-sure-local-include-dirs-come-first.patch
-0009-phonon-fix-colors-for-video-on-qgraphicsview.patch
-0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch
-# 99a3b72c0e064df9b4f0975bdab09508 - git-ptx-patches magic
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
index 4c91827a2..5b8c66553 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
@@ -115,6 +115,3 @@ index 0000000..e10ebcf
@@ -0,0 +1,2 @@
+
+#include "../../linux-g++/qplatformdefs.h"
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch
new file mode 100644
index 000000000..4f7973dad
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch
@@ -0,0 +1,81 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+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 <m.olbrich@pengutronix.de>
+---
+ examples/examples.pro | 4 ++++
+ projects.pro | 1 -
+ src/src.pro | 10 ++++++++--
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/examples/examples.pro b/examples/examples.pro
+index f233aba..ead2214 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 f94e1de..b34cc35 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 060f48b..27b1df9 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -105,19 +105,22 @@ src_webkit_declarative.target = sub-webkitdeclarative
+ 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_tools_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
+ src_s60installs.depends -= src_s60installs
+ src_imports.depends = src_gui src_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
+@@ -187,6 +190,9 @@ for(subname, SRC_SUBDIRS) {
+ EXTRA_RELEASE_TARGETS += release-$${subtarget}
+ QMAKE_EXTRA_TARGETS += release-$${subtarget}
+ }
++ contains(QT_CONFIG, phonon) {
++ src_plugins.depends += src_phonon
++ }
+ }
+ debug.depends = $$EXTRA_DEBUG_TARGETS
+ release.depends = $$EXTRA_RELEASE_TARGETS
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.7.3/0003-Hack-hide-cursor-during-startup.patch
index f4efd6b16..89033b0ff 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0003-Hack-hide-cursor-during-startup.patch
@@ -1,5 +1,5 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:52 +0100
+Date: Fri, 8 Oct 2010 20:13:40 +0200
Subject: [PATCH] Hack: hide cursor during startup
This will hide the cursor during application startup.
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp
-index a9cd8aa..cb9f173 100644
+index 439d412..5a2e0a4 100644
--- a/src/gui/embedded/qwscursor_qws.cpp
+++ b/src/gui/embedded/qwscursor_qws.cpp
@@ -344,7 +344,7 @@ void QWSServerPrivate::initializeCursor()
@@ -25,6 +25,3 @@ index a9cd8aa..cb9f173 100644
#endif
q->sendMouseEvent(QPoint(swidth/2, sheight/2), 0);
}
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch
new file mode 100644
index 000000000..f82cdeffe
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch
@@ -0,0 +1,50 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+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 <m.olbrich@pengutronix.de>
+---
+ examples/declarative/modelviews/modelviews.pro | 1 +
+ examples/examples.pro | 2 +-
+ examples/tutorials/tutorials.pro | 1 +
+ 3 files changed, 3 insertions(+), 1 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 ead2214..fe681ed 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/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
+index 34723c2..4728dac 100644
+--- a/examples/tutorials/tutorials.pro
++++ b/examples/tutorials/tutorials.pro
+@@ -1,5 +1,6 @@
+ TEMPLATE = subdirs
+ SUBDIRS = \
++ widgets \
+ addressbook \
+ modelview
+
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.7.3/0005-Fix-dnd-issue-on-QWS.patch
index 059f9f64f..1dd62dfce 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0005-Fix-dnd-issue-on-QWS.patch
@@ -1,5 +1,5 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:53 +0100
+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
@@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp
-index ec0247f..59058cc 100644
+index 4a0b9cc..65563a5 100644
--- a/src/gui/kernel/qdnd_qws.cpp
+++ b/src/gui/kernel/qdnd_qws.cpp
@@ -162,10 +162,10 @@ void QDragManager::updateCursor()
@@ -28,7 +28,7 @@ index ec0247f..59058cc 100644
if (qt_qws_dnd_deco)
qt_qws_dnd_deco->hide();
}
-@@ -242,7 +242,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
+@@ -246,7 +246,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
willDrop = false;
global_accepted_action = Qt::IgnoreAction;
updateCursor();
@@ -36,7 +36,7 @@ index ec0247f..59058cc 100644
object->d_func()->target = 0;
}
if (cw && cw->acceptDrops()) {
-@@ -253,7 +252,6 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
+@@ -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();
@@ -44,7 +44,7 @@ index ec0247f..59058cc 100644
}
} else if (cw) {
QDragMoveEvent dme(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData,
-@@ -277,8 +275,8 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
+@@ -281,8 +279,8 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
case QEvent::MouseButtonRelease:
{
qApp->removeEventFilter(this);
@@ -54,7 +54,7 @@ index ec0247f..59058cc 100644
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
-@@ -332,7 +330,6 @@ Qt::DropAction QDragManager::drag(QDrag *o)
+@@ -336,7 +334,6 @@ Qt::DropAction QDragManager::drag(QDrag *o)
willDrop = false;
updatePixmap();
updateCursor();
@@ -62,6 +62,3 @@ index ec0247f..59058cc 100644
object->d_func()->target = 0;
qApp->installEventFilter(this);
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch b/patches/qt-everywhere-opensource-src-4.7.3/0006-Hack-disable-Wl-gc-sections-on-ppc.patch
index 234cf7d03..1bb31ce91 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0006-Hack-disable-Wl-gc-sections-on-ppc.patch
@@ -1,5 +1,5 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 2 Feb 2011 18:31:53 +0100
+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.
@@ -12,20 +12,17 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
-index 7e57394..b2e2b77 100644
+index 37d216d..3470570 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -65,8 +65,8 @@ unix {
- lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml
+@@ -89,8 +89,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_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(QTDIR_build) {
- contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
---
-1.7.2.3
-
+ CONFIG(release):!CONFIG(standalone_package) {
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch b/patches/qt-everywhere-opensource-src-4.7.3/0007-qmake-make-sure-local-include-dirs-come-first.patch
index b242304ac..01f4fab3c 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0007-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 fa12aff..8ba50e1 100644
+index 188df0f..c95169d 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
-@@ -215,7 +215,7 @@ UnixMakefileGenerator::init()
+@@ -217,7 +217,7 @@ UnixMakefileGenerator::init()
cflags += " $(CFLAGS)";
else
cflags += " $(" + comps[i] + "FLAGS)";
@@ -25,10 +25,10 @@ index fa12aff..8ba50e1 100644
QString compiler = comps[i];
if (compiler == "C")
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index 0bb38fb..bbc85a7 100644
+index df580fd..eeaedd2 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
-@@ -955,7 +955,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -977,7 +977,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
compiler = "$(CXX)";
// compile command
@@ -37,6 +37,3 @@ index 0bb38fb..bbc85a7 100644
}
}
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch b/patches/qt-everywhere-opensource-src-4.7.3/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
index e8c3ede11..2968ff91a 100644
--- a/patches/qt-everywhere-opensource-src-4.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
@@ -34,6 +34,3 @@ index 89d5a9d..8508001 100644
template <VideoFormat FMT>
struct template_factory;
---
-1.7.2.3
-
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/series b/patches/qt-everywhere-opensource-src-4.7.3/series
new file mode 100644
index 000000000..4e05155e3
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-4.7.3/series
@@ -0,0 +1,10 @@
+# generated by git-ptx-patches
+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
+# 418ae070ff6139ecbe183be7c4e98631 - git-ptx-patches magic
diff --git a/rules/host-qt4.make b/rules/host-qt4.make
index 3a89d6fd8..34e769475 100644
--- a/rules/host-qt4.make
+++ b/rules/host-qt4.make
@@ -169,7 +169,7 @@ else
@echo -e '#!/bin/sh\nexport QMAKESPEC=linux-ptx-g++\nexec $(PTXDIST_SYSROOT_CROSS)/bin/qmake-cross "$$@"\n' > $(PTXDIST_SYSROOT_CROSS)/bin/qmake
endif
@chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qmake
- @echo -e "[Paths]\nPrefix=$(SYSROOT)/usr\nBinaries=$(PTXCONF_SYSROOT_HOST)/bin" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
+ @echo -e "[Paths]\nPrefix=$(SYSROOT)/usr\nBinaries=$(PTXCONF_SYSROOT_HOST)/bin\nImports=/usr/imports" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
@echo -e "[Paths]\nPrefix=$(PTXCONF_SYSROOT_HOST)" > $(PTXDIST_SYSROOT_HOST)/bin/qt.conf
@$(call touch)
diff --git a/rules/qt4.in b/rules/qt4.in
index b24cd7db1..9b68c9cf5 100644
--- a/rules/qt4.in
+++ b/rules/qt4.in
@@ -657,17 +657,19 @@ config QT4_OPENSSL
help
Add Qt support for openssl.
+config QT4_DBUS
+ bool
+ prompt "dbus support"
+ help
+ Build D-Bus bindings for Qt
+
choice
prompt "dbus support "
+ depends on QT4_DBUS
default QT4_DBUS_LOAD
help
Qt dbus support.
-config QT4_DBUS_NONE
- bool "none "
- help
- Disable Qt bus support.
-
config QT4_DBUS_LOAD
bool "load "
select QT4_BUILD_XML
@@ -713,6 +715,10 @@ config QT4_OPENGL_ES2
endchoice
+config QT4_OPENGL_EGL
+ bool "use EGL"
+ depends on QT4_BUILD_OPENGL && !QT4_OPENGL_DESKTOP
+
menu "optional libraries "
config QT4_BUILD_GUI
@@ -868,6 +874,26 @@ config QT4_BUILD_SCRIPTTOOLS
QtScriptTools provides additional components for applications that
use Qt Script.
+config QT4_BUILD_DECLARATIVE
+ bool
+ prompt "Declarative"
+ select QT4_BUILD_GUI
+ select QT4_BUILD_SQL
+ select QT4_BUILD_SCRIPT
+ select QT4_BUILD_NETWORK
+ help
+ QtDeclarative is a C++ library that provides the underlying engine,
+ which translates the declarative description of the UI in QML into
+ items on a QGraphicsScene. The library also provides APIs to bind
+ custom C++ types and elements to QML, and to connect the QML UI with
+ the underlying application logic written in C++.
+
+config QT4_INSTALL_QMLVIEWER
+ bool
+ prompt "install qmlviewer"
+ select QT4_BUILD_SQL
+ depends on QT4_BUILD_DECLARATIVE
+
endmenu
if QT4_PLATFORM_EMBEDDED
diff --git a/rules/qt4.make b/rules/qt4.make
index 2ac0e9c7d..dc94f537b 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4
#
# Paths and names
#
-QT4_VERSION := 4.6.3
-QT4_MD5 := 5c69f16d452b0bb3d44bc3c10556c072
+QT4_VERSION := 4.7.3
+QT4_MD5 := 49b96eefb1224cc529af6fe5608654fe
QT4 := qt-everywhere-opensource-src-$(QT4_VERSION)
QT4_SUFFIX := tar.gz
QT4_URL := http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX)
@@ -469,7 +469,7 @@ endif
ifdef PTXCONF_QT4_DBUS_LINK
QT4_AUTOCONF += -dbus-linked
endif
-ifdef PTXCONF_QT4_DBUS_NONE
+ifndef PTXCONF_QT4_DBUS
QT4_AUTOCONF += -no-qdbus
endif
@@ -489,6 +489,13 @@ ifdef PTXCONF_QT4_OPENGL_NONE
QT4_AUTOCONF += -no-opengl
endif
+ifdef PTXCONF_QT4_OPENGL_EGL
+QT4_AUTOCONF += -egl
+else
+QT4_AUTOCONF += -no-egl
+endif
+
+
ifdef PTXCONF_QT4_SHARED
QT4_AUTOCONF += -shared
QT4_PLUGIN_EXT := so
@@ -522,6 +529,10 @@ ifdef PTXCONF_QT4_BUILD_WEBKIT
QT4_AUTOCONF += -webkit
QT4_BUILD_TARGETS += sub-webkit
QT4_INSTALL_OPT += sub-webkit-install_subtargets
+ifdef PTXCONF_QT4_BUILD_DECLARATIVE
+QT4_BUILD_TARGETS += sub-webkitdeclarative
+QT4_INSTALL_OPT += sub-webkitdeclarative-install_subtargets
+endif
else
QT4_AUTOCONF += -no-webkit
endif
@@ -548,10 +559,12 @@ ifdef PTXCONF_QT4_SQLITE_PLUGIN
QT4_AUTOCONF += -plugin-sql-sqlite
endif
-ifneq ($(PTXCONF_QT4_BUILD_DESIGNERLIBS)$(PTXCONF_QT4_BUILD_ASSISTANTLIB),)
+ifneq ($(PTXCONF_QT4_BUILD_DESIGNERLIBS)$(PTXCONF_QT4_BUILD_ASSISTANTLIB)$(PTXCONF_QT4_INSTALL_QMLVIEWER),)
QT4_AUTOCONF += -make tools
QT4_BUILD_TOOLS_TARGETS = sub-tools
QT4_INSTALL_OPT += sub-tools-install_subtargets
+# qmlviewer does not need xml but we cannot built sub-tools without it
+QT4_BUILD_TARGETS += sub-xml
else
QT4_AUTOCONF += -nomake tools
endif
@@ -609,6 +622,13 @@ ifdef PTXCONF_QT4_BUILD_QTESTLIB
QT4_BUILD_TARGETS += sub-testlib
QT4_INSTALL_OPT += sub-testlib-install_subtargets
endif
+ifdef PTXCONF_QT4_BUILD_DECLARATIVE
+QT4_AUTOCONF += -declarative
+QT4_BUILD_TARGETS += sub-declarative sub-imports
+QT4_INSTALL_OPT += sub-declarative-install_subtargets sub-imports-install_subtargets
+else
+QT4_AUTOCONF += -no-declarative
+endif
$(STATEDIR)/qt4.compile:
@$(call targetinfo)
@@ -646,10 +666,6 @@ $(STATEDIR)/qt4.install:
# Target-Install
# ----------------------------------------------------------------------------
-QT_VERSION_L3 := $(QT4_VERSION)
-QT_VERSION_L2 := 4.6
-QT_VERSION_L1 := 4
-
$(STATEDIR)/qt4.targetinstall:
@$(call targetinfo)
@@ -688,11 +704,10 @@ ifdef PTXCONF_QT4_BUILD_QTESTLIB
@$(call install_lib, qt4, 0, 0, 0644, libQtTest)
endif
ifdef PTXCONF_QT4_BUILD_ASSISTANTLIB
- @$(call install_lib, qt4, 0, 0, 0644, libQtAssistantClient)
@$(call install_lib, qt4, 0, 0, 0644, libQtCLucene)
@$(call install_lib, qt4, 0, 0, 0644, libQtHelp)
endif
-ifneq ($(PTXCONF_QT4_DBUS_LOAD)$(PTXCONF_QT4_DBUS_LINK),)
+ifdef PTXCONF_QT4_DBUS
@$(call install_lib, qt4, 0, 0, 0644, libQtDBus)
endif
ifdef PTXCONF_QT4_BUILD_DESIGNERLIBS
@@ -700,6 +715,12 @@ ifdef PTXCONF_QT4_BUILD_DESIGNERLIBS
endif
ifdef PTXCONF_QT4_BUILD_WEBKIT
@$(call install_lib, qt4, 0, 0, 0644, libQtWebKit)
+ifdef PTXCONF_QT4_BUILD_DECLARATIVE
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/QtWebKit/qmldir)
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/QtWebKit/libqmlwebkitplugin.so)
+endif
endif
ifdef PTXCONF_QT4_BUILD_SCRIPTTOOLS
@$(call install_lib, qt4, 0, 0, 0644, libQtScriptTools)
@@ -707,8 +728,23 @@ endif
ifdef PTXCONF_QT4_BUILD_QTXMLPATTERNS
@$(call install_lib, qt4, 0, 0, 0644, libQtXmlPatterns)
endif
-ifdef PTXCONF_QT4_BUILD_MULTIMEDIA
- @$(call install_lib, qt4, 0, 0, 0644, libQtMultimedia)
+ifdef PTXCONF_QT4_BUILD_DECLARATIVE
+ @$(call install_lib, qt4, 0, 0, 0644, libQtDeclarative)
+
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/folderlistmodel/qmldir)
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so)
+
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/gestures/qmldir)
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/gestures/libqmlgesturesplugin.so)
+
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/particles/qmldir)
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/imports/Qt/labs/particles/libqmlparticlesplugin.so)
endif
ifdef PTXCONF_QT4_BUILD_OPENGL
@$(call install_lib, qt4, 0, 0, 0644, libQtOpenGL)
@@ -742,7 +778,7 @@ ifdef PTXCONF_QT4_GFX_POWERVR_PLUGIN
/usr/plugins/gfxdrivers/libqgfxpvregl.$(QT4_PLUGIN_EXT))
@$(call install_lib, qt4, 0, 0, 0644, libpvrQWSWSEGL)
endif
-ifneq ($(PTXCONF_QT4_DBUS_LOAD)$(PTXCONF_QT4_DBUS_LINK),)
+ifdef PTXCONF_QT4_DBUS
ifdef PTXCONF_QT4_BUILD_SCRIPT
@$(call install_copy, qt4, 0, 0, 0644, -, \
/usr/plugins/script/libqtscriptdbus.$(QT4_PLUGIN_EXT))
@@ -774,10 +810,20 @@ ifdef PTXCONF_QT4_BUILD_SVG
@$(call install_copy, qt4, 0, 0, 0644, -, \
/usr/plugins/iconengines/libqsvgicon.$(QT4_PLUGIN_EXT))
endif
+ifndef PTXCONF_QT4_BUILD_NETWORK
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT))
+ @$(call install_copy, qt4, 0, 0, 0644, -, \
+ /usr/plugins/bearer/libqnmbearer.$(QT4_PLUGIN_EXT))
+endif
ifdef PTXCONF_QT4_BUILD_PHONON
@$(call install_copy, qt4, 0, 0, 0644, -, \
/usr/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT))
endif
+ifdef PTXCONF_QT4_INSTALL_QMLVIEWER
+ @$(call install_copy, qt4, 0, 0, 0755, -, \
+ /usr/bin/qmlviewer)
+endif
ifdef PTXCONF_QT4_FONT_DEJAVU
@for i in \