qt4: version bump 4.7.3 -> 4.7.4

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

10 files changed, 32 insertions, 33 deletions

diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.7.4/0001-mkspec-for-ptxdist.patch
index 4db0b9f9b..fa9b18141 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0001-mkspec-for-ptxdist.patch
@@ -10,9 +10,9 @@ 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       |   40 +++++++++++++++++++++++++++++
  mkspecs/linux-ptx-g++/qplatformdefs.h     |    2 +
- mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   31 +++++++++++++++++++++++++++++
+ mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   31 ++++++++++++++++++++++
  mkspecs/qws/linux-ptx-g++/qplatformdefs.h |    2 +
  4 files changed, 75 insertions(+), 0 deletions(-)
  create mode 100644 mkspecs/linux-ptx-g++/qmake.conf.in
@@ -22,7 +22,7 @@ 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..495c53e
+index 0000000..5153cf3
 --- /dev/null
 +++ b/mkspecs/linux-ptx-g++/qmake.conf.in
 @@ -0,0 +1,40 @@
@@ -76,7 +76,7 @@ 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..6b5c824
+index 0000000..014b71f
 --- /dev/null
 +++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
 @@ -0,0 +1,31 @@
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch b/patches/qt-everywhere-opensource-src-4.7.4/0002-disable-ordered-compiling.patch
index 4f7973dad..9daa49f59 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0002-disable-ordered-compiling.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0002-disable-ordered-compiling.patch
@@ -10,8 +10,8 @@ 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(-)
+ src/src.pro           |    8 ++++++--
+ 3 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/examples/examples.pro b/examples/examples.pro
 index f233aba..ead2214 100644
@@ -29,7 +29,7 @@ index f233aba..ead2214 100644
  
  contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 diff --git a/projects.pro b/projects.pro
-index f94e1de..b34cc35 100644
+index 02bf61d..ea5b0e7 100644
 --- a/projects.pro
 +++ b/projects.pro
 @@ -2,7 +2,6 @@
@@ -41,10 +41,10 @@ index f94e1de..b34cc35 100644
  
  cross_compile: CONFIG += nostrip
 diff --git a/src/src.pro b/src/src.pro
-index 060f48b..27b1df9 100644
+index 868e22f..a803ec8 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -105,19 +105,22 @@ src_webkit_declarative.target = sub-webkitdeclarative
+@@ -105,12 +105,13 @@ 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
@@ -52,16 +52,15 @@ index 060f48b..27b1df9 100644
 +   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_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
+@@ -118,6 +119,7 @@ src_webkit_declarative.target = sub-webkitdeclarative
     contains(QT_CONFIG, webkit)  {
        src_webkit.depends = src_gui src_sql src_network
        contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
@@ -69,13 +68,12 @@ index 060f48b..27b1df9 100644
        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}
+@@ -142,6 +144,8 @@ src_webkit_declarative.target = sub-webkitdeclarative
+       src_declarative.depends += src_svg
     }
-+   contains(QT_CONFIG, phonon) {
-+      src_plugins.depends += src_phonon
-+   }
+    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
  }
- debug.depends = $$EXTRA_DEBUG_TARGETS
- release.depends = $$EXTRA_RELEASE_TARGETS
+ 
+ 
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.7.4/0003-Hack-hide-cursor-during-startup.patch
index 89033b0ff..5fe3a10dd 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0003-Hack-hide-cursor-during-startup.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0003-Hack-hide-cursor-during-startup.patch
@@ -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 439d412..5a2e0a4 100644
+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()
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch b/patches/qt-everywhere-opensource-src-4.7.4/0004-add-missing-subdirs.patch
index f82cdeffe..26783e991 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0004-add-missing-subdirs.patch
@@ -38,7 +38,7 @@ index ead2214..fe681ed 100644
  # install
  sources.files = README *.pro
 diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
-index 34723c2..4728dac 100644
+index 1b4667e..12adac4 100644
 --- a/examples/tutorials/tutorials.pro
 +++ b/examples/tutorials/tutorials.pro
 @@ -1,5 +1,6 @@
@@ -46,5 +46,5 @@ index 34723c2..4728dac 100644
  SUBDIRS       = \
 +                widgets \
                  addressbook \
-                 modelview
- 
+                 modelview \
+                 threads
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.7.4/0005-Fix-dnd-issue-on-QWS.patch
index 1dd62dfce..35f969413 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0005-Fix-dnd-issue-on-QWS.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0005-Fix-dnd-issue-on-QWS.patch
@@ -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 4a0b9cc..65563a5 100644
+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()
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/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
index 1bb31ce91..d1cf09789 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/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
@@ -12,10 +12,10 @@ 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 37d216d..3470570 100644
+index c70a168..baa7102 100644
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -89,8 +89,8 @@ unix {
+@@ -88,8 +88,8 @@ unix {
      QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
  }
  
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0007-qmake-make-sure-local-include-dirs-come-first.patch b/patches/qt-everywhere-opensource-src-4.7.4/0007-qmake-make-sure-local-include-dirs-come-first.patch
index 01f4fab3c..59ee9e6b5 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0007-qmake-make-sure-local-include-dirs-come-first.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0007-qmake-make-sure-local-include-dirs-come-first.patch
@@ -12,7 +12,7 @@ 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 188df0f..c95169d 100644
+index bbddc5e..8087d3c 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
 @@ -217,7 +217,7 @@ UnixMakefileGenerator::init()
@@ -25,10 +25,10 @@ index 188df0f..c95169d 100644
          QString compiler = comps[i];
          if (compiler == "C")
 diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index df580fd..eeaedd2 100644
+index 911b617..ae53c75 100644
 --- a/qmake/generators/unix/unixmake2.cpp
 +++ b/qmake/generators/unix/unixmake2.cpp
-@@ -977,7 +977,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -978,7 +978,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                  compiler = "$(CXX)";
  
              // compile command
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch b/patches/qt-everywhere-opensource-src-4.7.4/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
index 2968ff91a..2968ff91a 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.4/0008-phonon-fix-colors-for-video-on-qgraphicsview.patch
diff --git a/patches/qt-everywhere-opensource-src-4.7.3/series b/patches/qt-everywhere-opensource-src-4.7.4/series
index 4e05155e3..c96a176f7 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/series
+++ b/patches/qt-everywhere-opensource-src-4.7.4/series
@@ -1,4 +1,5 @@
 # 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
@@ -7,4 +8,4 @@
 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
+# 208e139d5e06ac81409dceacfb019dd0  - git-ptx-patches magic
diff --git a/rules/qt4.make b/rules/qt4.make
index 34ba99452..5747d146f 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_QT4) += qt4
 #
 # Paths and names
 #
-QT4_VERSION	:= 4.7.3
-QT4_MD5		:= 49b96eefb1224cc529af6fe5608654fe
+QT4_VERSION	:= 4.7.4
+QT4_MD5		:= ddf7d83f912cf1283aa066368464fa22
 QT4		:= qt-everywhere-opensource-src-$(QT4_VERSION)
 QT4_SUFFIX	:= tar.gz
 QT4_URL		:= http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX)