From 49dcd3c75b29d0017f4d28436ea18ea69b712b57 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 2 Feb 2011 18:29:18 +0100 Subject: qt4: cleanup & update patches Signed-off-by: Michael Olbrich --- .../0001-mkspec-for-ptxdist.patch | 120 +++++++++++++++++++++ .../0002-disable-ordered-compiling.patch | 56 ++++++++++ .../0003-Hack-hide-cursor-during-startup.patch | 30 ++++++ .../0004-add-missing-subdir.patch | 27 +++++ .../0005-Fix-dnd-issue-on-QWS.patch | 67 ++++++++++++ .../0006-fix-zlib-handling-for-host-tools.patch | 49 +++++++++ .../0007-Hack-disable-Wl-gc-sections-on-ppc.patch | 31 ++++++ ...e-make-sure-local-include-dirs-come-first.patch | 42 ++++++++ ...non-fix-colors-for-video-on-qgraphicsview.patch | 39 +++++++ .../fix-examples.diff | 24 ----- .../fix-host-zlib.diff | 46 -------- .../fix-qws-dnd.diff | 64 ----------- .../hide-cursor-at-startup.diff | 27 ----- .../ppc-hack.diff | 28 ----- .../ptx-mkspec.diff | 101 ----------------- .../remove-ordered.diff | 52 --------- patches/qt-everywhere-opensource-src-4.6.3/series | 18 ++-- 17 files changed, 472 insertions(+), 349 deletions(-) create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch create mode 100644 patches/qt-everywhere-opensource-src-4.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/fix-examples.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/fix-host-zlib.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/fix-qws-dnd.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/hide-cursor-at-startup.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff delete mode 100644 patches/qt-everywhere-opensource-src-4.6.3/remove-ordered.diff (limited to 'patches') diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch b/patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch new file mode 100644 index 000000000..4c91827a2 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0001-mkspec-for-ptxdist.patch @@ -0,0 +1,120 @@ +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 | 38 +++++++++++++++++++++++++++++ + mkspecs/linux-ptx-g++/qplatformdefs.h | 2 + + mkspecs/qws/linux-ptx-g++/qmake.conf.in | 29 ++++++++++++++++++++++ + mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + + 4 files changed, 71 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..495c53e +--- /dev/null ++++ b/mkspecs/linux-ptx-g++/qmake.conf.in +@@ -0,0 +1,38 @@ ++# ++# qmake configuration for linux-ptx-g++ ++# ++ ++ ++include(../common/g++.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_CXX = @COMPILER_PREFIX@g++ ++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..6b5c824 +--- /dev/null ++++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in +@@ -0,0 +1,29 @@ ++# ++# qmake configuration for linux-ptx-g++ ++# ++ ++ ++include(../../common/g++.conf) ++include(../../common/linux.conf) ++include(../../common/qws.conf) ++ ++# modifications to g++.conf ++QMAKE_CC = @COMPILER_PREFIX@gcc ++QMAKE_CXX = @COMPILER_PREFIX@g++ ++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" +-- +1.7.2.3 + 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 new file mode 100644 index 000000000..a5975b738 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0002-disable-ordered-compiling.patch @@ -0,0 +1,56 @@ +From: Michael Olbrich +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 +--- + 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/0003-Hack-hide-cursor-during-startup.patch b/patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch new file mode 100644 index 000000000..f4efd6b16 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0003-Hack-hide-cursor-during-startup.patch @@ -0,0 +1,30 @@ +From: Michael Olbrich +Date: Wed, 2 Feb 2011 18:31:52 +0100 +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 a9cd8aa..cb9f173 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); + } +-- +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 new file mode 100644 index 000000000..03b7d9069 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0004-add-missing-subdir.patch @@ -0,0 +1,27 @@ +From: Michael Olbrich +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 +--- + 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/0005-Fix-dnd-issue-on-QWS.patch b/patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch new file mode 100644 index 000000000..059f9f64f --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0005-Fix-dnd-issue-on-QWS.patch @@ -0,0 +1,67 @@ +From: Michael Olbrich +Date: Wed, 2 Feb 2011 18:31:53 +0100 +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 ec0247f..59058cc 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(); + } +@@ -242,7 +242,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()) { +@@ -253,7 +252,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, +@@ -277,8 +275,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 +@@ -332,7 +330,6 @@ Qt::DropAction QDragManager::drag(QDrag *o) + willDrop = false; + updatePixmap(); + updateCursor(); +- restoreCursor = true; + object->d_func()->target = 0; + qApp->installEventFilter(this); + +-- +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 new file mode 100644 index 000000000..848951d7f --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0006-fix-zlib-handling-for-host-tools.patch @@ -0,0 +1,49 @@ +From: Michael Olbrich +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 +--- + 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/0007-Hack-disable-Wl-gc-sections-on-ppc.patch b/patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch new file mode 100644 index 000000000..234cf7d03 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0007-Hack-disable-Wl-gc-sections-on-ppc.patch @@ -0,0 +1,31 @@ +From: Michael Olbrich +Date: Wed, 2 Feb 2011 18:31:53 +0100 +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 +--- + 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 7e57394..b2e2b77 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 + } + +-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 + + CONFIG(release):!CONFIG(QTDIR_build) { + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols +-- +1.7.2.3 + 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.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch new file mode 100644 index 000000000..b242304ac --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0008-qmake-make-sure-local-include-dirs-come-first.patch @@ -0,0 +1,42 @@ +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 fa12aff..8ba50e1 100644 +--- a/qmake/generators/unix/unixmake.cpp ++++ b/qmake/generators/unix/unixmake.cpp +@@ -215,7 +215,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 0bb38fb..bbc85a7 100644 +--- a/qmake/generators/unix/unixmake2.cpp ++++ b/qmake/generators/unix/unixmake2.cpp +@@ -955,7 +955,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; + } + } + +-- +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.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch new file mode 100644 index 000000000..e8c3ede11 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0009-phonon-fix-colors-for-video-on-qgraphicsview.patch @@ -0,0 +1,39 @@ +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; +-- +1.7.2.3 + diff --git a/patches/qt-everywhere-opensource-src-4.6.3/fix-examples.diff b/patches/qt-everywhere-opensource-src-4.6.3/fix-examples.diff deleted file mode 100644 index 0cbc11ee3..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/fix-examples.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Olbrich -Subject: add missing subdir - -"widgets" is missing from SUBDIRS and wont be commpiled. - -This patch addes it. - -Signed-off-by: Michael Olbrich - ---- - examples/tutorials/tutorials.pro | 1 + - 1 file changed, 1 insertion(+) - -Index: b/examples/tutorials/tutorials.pro -=================================================================== ---- a/examples/tutorials/tutorials.pro -+++ b/examples/tutorials/tutorials.pro -@@ -1,5 +1,6 @@ - TEMPLATE = subdirs - SUBDIRS = \ -+ widgets \ - addressbook - - # install diff --git a/patches/qt-everywhere-opensource-src-4.6.3/fix-host-zlib.diff b/patches/qt-everywhere-opensource-src-4.6.3/fix-host-zlib.diff deleted file mode 100644 index 06eecc5a4..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/fix-host-zlib.diff +++ /dev/null @@ -1,46 +0,0 @@ -From: Michael Olbrich -Subject: 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 - ---- - src/tools/bootstrap/bootstrap.pri | 2 +- - src/tools/bootstrap/bootstrap.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: b/src/tools/bootstrap/bootstrap.pro -=================================================================== ---- 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 \ -Index: b/src/tools/bootstrap/bootstrap.pri -=================================================================== ---- 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/patches/qt-everywhere-opensource-src-4.6.3/fix-qws-dnd.diff b/patches/qt-everywhere-opensource-src-4.6.3/fix-qws-dnd.diff deleted file mode 100644 index c6a2e6c23..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/fix-qws-dnd.diff +++ /dev/null @@ -1,64 +0,0 @@ -From: Michael Olbrich -Subject: 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 file changed, 3 insertions(+), 6 deletions(-) - -Index: b/src/gui/kernel/qdnd_qws.cpp -=================================================================== ---- 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(); - } -@@ -242,7 +242,6 @@ bool QDragManager::eventFilter(QObject * - willDrop = false; - global_accepted_action = Qt::IgnoreAction; - updateCursor(); -- restoreCursor = true; - object->d_func()->target = 0; - } - if (cw && cw->acceptDrops()) { -@@ -253,7 +252,6 @@ bool QDragManager::eventFilter(QObject * - 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, -@@ -277,8 +275,8 @@ bool QDragManager::eventFilter(QObject * - case QEvent::MouseButtonRelease: - { - qApp->removeEventFilter(this); -+ willDrop = false; - if (restoreCursor) { -- willDrop = false; - #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); - #endif -@@ -332,7 +330,6 @@ Qt::DropAction QDragManager::drag(QDrag - willDrop = false; - updatePixmap(); - updateCursor(); -- restoreCursor = true; - object->d_func()->target = 0; - qApp->installEventFilter(this); - diff --git a/patches/qt-everywhere-opensource-src-4.6.3/hide-cursor-at-startup.diff b/patches/qt-everywhere-opensource-src-4.6.3/hide-cursor-at-startup.diff deleted file mode 100644 index a9ef77b9f..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/hide-cursor-at-startup.diff +++ /dev/null @@ -1,27 +0,0 @@ -Subject: Hack: hide cursor during startup -From: Michael Olbrich - -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 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/src/gui/embedded/qwscursor_qws.cpp -=================================================================== ---- 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.6.3/ppc-hack.diff b/patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff deleted file mode 100644 index bdb55cceb..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff +++ /dev/null @@ -1,28 +0,0 @@ -Subject: Hack: disable -Wl,--gc-sections on ppc -From: Michael Olbrich - -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 - ---- - src/3rdparty/webkit/WebCore/WebCore.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: b/src/3rdparty/webkit/WebCore/WebCore.pro -=================================================================== ---- 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 - } - --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 - - CONFIG(release):!CONFIG(QTDIR_build) { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff --git a/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff b/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff deleted file mode 100644 index 328b10699..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff +++ /dev/null @@ -1,101 +0,0 @@ -Subject: mkspec for ptxdist -From: Michael Olbrich - -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 | 35 ++++++++++++++++++++++++++++++ - mkspecs/linux-ptx-g++/qplatformdefs.h | 2 + - mkspecs/qws/linux-ptx-g++/qmake.conf.in | 25 +++++++++++++++++++++ - mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + - 4 files changed, 64 insertions(+) - -Index: b/mkspecs/qws/linux-ptx-g++/qmake.conf.in -=================================================================== ---- /dev/null -+++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in -@@ -0,0 +1,25 @@ -+# -+# qmake configuration for linux-ptx-g++ -+# -+ -+ -+include(../../common/g++.conf) -+include(../../common/linux.conf) -+include(../../common/qws.conf) -+ -+# modifications to g++.conf -+QMAKE_CC = @COMPILER_PREFIX@gcc -+QMAKE_CXX = @COMPILER_PREFIX@g++ -+QMAKE_INCDIR = @INCDIR@ -+QMAKE_LIBDIR = @LIBDIR@ -+ -+QMAKE_LINK = @COMPILER_PREFIX@g++ -+QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ -+QMAKE_LFLAGS = @LDFLAGS@ -+ -+# modifications to linux.conf -+QMAKE_AR = @COMPILER_PREFIX@ar cqs -+QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy -+QMAKE_STRIP = @COMPILER_PREFIX@strip -+ -+load(qt_config) -Index: b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h -=================================================================== ---- /dev/null -+++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h -@@ -0,0 +1,2 @@ -+ -+#include "../../linux-g++/qplatformdefs.h" -Index: b/mkspecs/linux-ptx-g++/qmake.conf.in -=================================================================== ---- /dev/null -+++ b/mkspecs/linux-ptx-g++/qmake.conf.in -@@ -0,0 +1,35 @@ -+# -+# qmake configuration for linux-ptx-g++ -+# -+ -+ -+include(../common/g++.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_CXX = @COMPILER_PREFIX@g++ -+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 = -+ -+# modifications to linux.conf -+QMAKE_AR = @COMPILER_PREFIX@ar cqs -+QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy -+QMAKE_STRIP = @COMPILER_PREFIX@strip -+ -+load(qt_config) -Index: b/mkspecs/linux-ptx-g++/qplatformdefs.h -=================================================================== ---- /dev/null -+++ b/mkspecs/linux-ptx-g++/qplatformdefs.h -@@ -0,0 +1,2 @@ -+ -+#include "../linux-g++/qplatformdefs.h" diff --git a/patches/qt-everywhere-opensource-src-4.6.3/remove-ordered.diff b/patches/qt-everywhere-opensource-src-4.6.3/remove-ordered.diff deleted file mode 100644 index 81ec543a2..000000000 --- a/patches/qt-everywhere-opensource-src-4.6.3/remove-ordered.diff +++ /dev/null @@ -1,52 +0,0 @@ -Subject: disable ordered compiling. -From: Michael Olbrich - -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 ---- - projects.pro | 1 - - src/src.pro | 6 ++++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -Index: b/projects.pro -=================================================================== ---- a/projects.pro -+++ b/projects.pro -@@ -2,7 +2,6 @@ - # Main projectfile - ##################################################################### - --CONFIG += ordered - TEMPLATE = subdirs - - cross_compile: CONFIG += nostrip -Index: b/src/src.pro -=================================================================== ---- 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 -@@ -115,6 +116,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 { diff --git a/patches/qt-everywhere-opensource-src-4.6.3/series b/patches/qt-everywhere-opensource-src-4.6.3/series index d98b501b6..fd6385c10 100644 --- a/patches/qt-everywhere-opensource-src-4.6.3/series +++ b/patches/qt-everywhere-opensource-src-4.6.3/series @@ -1,7 +1,11 @@ -ptx-mkspec.diff -remove-ordered.diff -hide-cursor-at-startup.diff -fix-examples.diff -fix-qws-dnd.diff -fix-host-zlib.diff -ppc-hack.diff +# 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 +# 4850bc496f565516b8725a1e3a1b3a37 - git-ptx-patches magic -- cgit v1.2.3