diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4')
30 files changed, 0 insertions, 1708 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index d8b0a09d17..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 55097d27e8b746b3d5ff437939caf1fa43c0d62b Mon Sep 17 00:00:00 2001 -From: Holger Freyther <zecke@selfish.org> -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 01/21] qlibraryinfo: allow to set qt.conf from the outside - using the environment - -Allow to set a qt.conf from the outside using the environment. This allows -to inject new prefixes and other paths into qmake. This is needed when using -the same qmake binary to build qt/x11 and qt/embedded - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/corelib/global/qlibraryinfo.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 180dc39..4adad35 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -54,6 +54,7 @@ - QT_BEGIN_NAMESPACE - extern QString qmake_libraryInfoFile(); - QT_END_NAMESPACE -+#include <stdlib.h> - #else - # include "qcoreapplication.h" - #endif -@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - #ifdef BOOTSTRAPPING - if(!QFile::exists(qtconfig)) - qtconfig = qmake_libraryInfoFile(); -+ if (!QFile::exists(qtconfig)) { -+ QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = QFile::decodeName(config); -+ } - #else - if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { - #ifdef Q_OS_MAC --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch deleted file mode 100644 index 98fc88738f..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5e6b1051afa3099a02a758b0596236759d70670e Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Wed, 26 Sep 2012 20:18:08 +0200 -Subject: [PATCH 02/21] qkbdtty_qws: fix build with old kernel headers - -This issue is that with C++ compiler process an old version of kernel -header file, coincidently that file has a variable named 'new': - -* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h'; -* '/usr/include/linux/vt.h' has below code on SLED-11.x: - + unsigned int new; - -On mostly hosts it has been changed to: new -> newev. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp -index a46811b..762138f 100644 ---- a/src/gui/embedded/qkbdtty_qws.cpp -+++ b/src/gui/embedded/qkbdtty_qws.cpp -@@ -54,8 +54,20 @@ - - #if defined Q_OS_LINUX - # include <linux/kd.h> -+ -+/* Workaround kernel headers using "new" as variable name. The problem -+ is specific to SLED-11, other distros use "newev" rather than "new" */ -+#ifdef __cplusplus -+#warning "workaround kernel headers using new as variable name on SLED 11" -+#define new newev -+#endif -+ - # include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?) - -+#ifdef __cplusplus -+#undef new -+#endif -+ - # include "qscreen_qws.h" - # include "qwindowsystem_qws.h" - # include "qapplication.h" --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch deleted file mode 100644 index ecaea51e08..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 1 May 2012 07:48:15 +0200 -Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty - -Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem -now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl - -First reported here: -http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro -index 006a88c..5e17193 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro -+++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro -@@ -3,6 +3,8 @@ TARGET = dummy - - CONFIG -= debug_and_release - -+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. -+ - CONFIG(standalone_package) { - isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated - isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch deleted file mode 100644 index 1eb8a5843a..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af699c6e8cf9fb28d6f8b789bf33d53b47edaec7 Mon Sep 17 00:00:00 2001 -From: Michael Krelin <hacker@klever.net> -Date: Wed, 26 Sep 2012 20:24:20 +0200 -Subject: [PATCH 04/21] configure: qmake is already built in qt4-tools-native, - so disable it - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index e3d464b..cc04b27 100755 ---- a/configure -+++ b/configure -@@ -4899,7 +4899,7 @@ setBootstrapVariable() - } - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch deleted file mode 100644 index 1a8f2b7f94..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> -Date: Wed, 26 Sep 2012 20:27:44 +0200 -Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index cc04b27..5a7c4ee 100755 ---- a/configure -+++ b/configure -@@ -690,7 +690,7 @@ fi - # initalize variables - #------------------------------------------------------------------------------- - --SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" -+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" - for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch deleted file mode 100644 index 90ebf75095..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 26 Sep 2012 20:29:09 +0200 -Subject: [PATCH 06/21] configure: Use OE_QMAKE_* values to specify Qt utility - paths - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure b/configure -index 5a7c4ee..db4d044 100755 ---- a/configure -+++ b/configure -@@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE - QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc - - #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR --QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc --QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic --QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 --QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc --QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp -+QMAKE_MOC = \${OE_QMAKE_MOC} -+QMAKE_UIC = \${OE_QMAKE_UIC} -+QMAKE_UIC3 = \${OE_QMAKE_UIC3} -+QMAKE_RCC = \${OE_QMAKE_RCC} -+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP} - QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include - QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib - --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch deleted file mode 100644 index 7d3b336f77..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001 -From: Pavel Heimlich <tropikhajma@gmail.com> -Date: Wed, 26 Sep 2012 20:31:10 +0200 -Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure - building nativesdk-qt4-tools - -Patch has apparently been rejected upstream, not because it is invalid -but because the submitter did not submit a merge request for it, so the -validity of the patch upstream is uncertain. For further details see: -http://bugreports.qt.nokia.com/browse/QTBUG-17962 - -Upstream-Status: Denied [possible retry] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/dbus/qdbusintegrator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index 0f0b647..aa4cbab 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE - static bool isDebugging; - #define qDBusDebug if (!::isDebugging); else qDebug - --Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) -+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) - - static inline QString dbusServiceString() - { return *orgFreedesktopDBusString(); } --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch deleted file mode 100644 index ec07f41403..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 26 Sep 2012 20:32:41 +0200 -Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the - target - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 38e0fce..53b1ffb 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -7,6 +7,7 @@ CONFIG += console bootstrap - CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED - DESTDIR = ../bin/ -+TARGET = qmake2 - - OBJECTS_DIR = . - MOC_DIR = . --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch deleted file mode 100644 index 45b8c10fbe..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 26 Sep 2012 20:33:49 +0200 -Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri - -Fix duplicate entries in SOURCES and HEADERS, and fix the source file -list for the split of qlocale.cpp. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - qmake/qmake.pri | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/qmake/qmake.pri b/qmake/qmake.pri -index 31f67f4..9081669 100644 ---- a/qmake/qmake.pri -+++ b/qmake/qmake.pri -@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ - generators/symbian/initprojectdeploy_symbian.cpp \ - generators/integrity/gbuild.cpp \ - windows/registry.cpp \ -- symbian/epocroot.cpp \ -- generators/integrity/gbuild.cpp -+ symbian/epocroot.cpp - - HEADERS += project.h property.h generators/makefile.h \ - generators/unix/unixmake.h meta.h option.h cachekeys.h \ -@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \ - generators/symbian/initprojectdeploy_symbian.h \ - generators/integrity/gbuild.h \ - windows/registry_p.h \ -- symbian/epocroot_p.h \ -- generators/integrity/gbuild.h -+ symbian/epocroot_p.h - - contains(QT_EDITION, OpenSource) { - DEFINES += QMAKE_OPENSOURCE_EDITION -@@ -72,6 +70,8 @@ bootstrap { #Qt code - qlist.cpp \ - qlinkedlist.cpp \ - qlocale.cpp \ -+ qlocale_tools.cpp \ -+ qlocale_unix.cpp \ - qmalloc.cpp \ - qmap.cpp \ - qmetatype.cpp \ --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch deleted file mode 100644 index 1d2ddab490..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001 -From: Holger Freyther <zecke@selfish.org> -Date: Wed, 26 Sep 2012 20:36:38 +0200 -Subject: [PATCH 10/21] configure: Hack to not use the pg_config of the host - system which will add /usr/include - -pg_config is a native binary so using that when cross compiling -will always fail. The commented out fix would do, but for OE -our -platform and -xplatform is the same so we are actually not -really cross compiling. Just comment out the test, we are passing -the location to the postgres headers and if they are okay we -will pad. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index db4d044..35a8fe7 100755 ---- a/configure -+++ b/configure -@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - psql) - if [ "$CFG_SQL_psql" != "no" ]; then - # Be careful not to use native pg_config when cross building. -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` -- fi -+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` -+# fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" - # But, respect PSQL_LIBS if set --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch deleted file mode 100644 index e0879c5615..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001 -From: Michael Krelin <hacker@klever.net> -Date: Mon, 4 Jun 2007 14:48:50 +0200 -Subject: [PATCH 11/21] freetype host includes - -Host include path should not be used in cross compiling case. - -Ported from OE by: Yu Ke <ke.yu@intel.com> -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - config.tests/unix/freetype/freetype.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri -index 7ef1cf9..b362fcd 100644 ---- a/config.tests/unix/freetype/freetype.pri -+++ b/config.tests/unix/freetype/freetype.pri -@@ -1,5 +1,5 @@ - !cross_compile { -- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH -+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - for(p, TRY_INCLUDEPATHS) { --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch deleted file mode 100644 index 8402eab635..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch +++ /dev/null @@ -1,318 +0,0 @@ -From 8744273fc452eb54bbeeb7d15823009ce926c6fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> -Date: Wed, 26 Sep 2012 20:39:21 +0200 -Subject: [PATCH 12/21] Add 2bpp support - -Submitted upstream but rejected as being "out of scope": -http://bugreports.qt.nokia.com/browse/QTBUG-3468 - -Upstream-Status: Denied - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 5 +- - src/gui/embedded/qscreen_qws.cpp | 211 ++++++++++++++++++++++++++++++++ - src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 +- - 3 files changed, 216 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 35a8fe7..79c1c7b 100755 ---- a/configure -+++ b/configure -@@ -7063,6 +7063,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then - echo "Choose pixel-depths to support:" - echo - echo " 1. 1bpp, black/white" -+ echo " 2. 2bpp, grayscale" - echo " 4. 4bpp, grayscale" - echo " 8. 8bpp, paletted" - echo " 12. 12bpp, rgb 4-4-4" -@@ -7081,11 +7082,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then - fi - if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then - if [ "$CFG_QWS_DEPTHS" = "all" ]; then -- CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic" -+ CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic" - fi - for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do - case $D in -- 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";; -+ 1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";; - generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";; - esac - done -diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp -index b307bf2..88950b3 100644 ---- a/src/gui/embedded/qscreen_qws.cpp -+++ b/src/gui/embedded/qscreen_qws.cpp -@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color, - } - #endif // QT_QWS_DEPTH_4 - -+#ifdef QT_QWS_DEPTH_2 -+static inline void qt_rectfill_gray2(quint8 *dest, quint8 value, -+ int x, int y, int width, int height, -+ int stride) -+{ -+ const int pixelsPerByte = 4; -+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3); -+ const int doAlign = (alignWidth > 0 ? 1 : 0); -+ const int alignStart = pixelsPerByte - 1 - (x & 3); -+ const int alignStop = alignStart - (alignWidth - 1); -+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop); -+ const int tailWidth = (width - alignWidth) & 3; -+ const int doTail = (tailWidth > 0 ? 1 : 0); -+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1; -+ const int width8 = (width - alignWidth) / pixelsPerByte; -+ -+ dest += y * stride + x / pixelsPerByte; -+ stride -= (doAlign + width8); -+ -+ for (int j = 0; j < height; ++j) { -+ if (doAlign) { -+ *dest = (*dest & ~alignMask) | (value & alignMask); -+ ++dest; -+ } -+ if (width8) { -+ qt_memfill<quint8>(dest, value, width8); -+ dest += width8; -+ } -+ if (doTail) -+ *dest = (*dest & tailMask) | (value & ~tailMask); -+ dest += stride; -+ } -+} -+ -+static void solidFill_gray2(QScreen *screen, const QColor &color, -+ const QRegion ®ion) -+{ -+ quint8 *dest = reinterpret_cast<quint8*>(screen->base()); -+ const quint8 c = qGray(color.rgba()) >> 6; -+ const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c; -+ -+ const int stride = screen->linestep(); -+ const QVector<QRect> rects = region.rects(); -+ -+ for (int i = 0; i < rects.size(); ++i) { -+ const QRect r = rects.at(i); -+ qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(), -+ stride); -+ } -+} -+#endif // QT_QWS_DEPTH_2 -+ - #ifdef QT_QWS_DEPTH_1 - static inline void qt_rectfill_mono(quint8 *dest, quint8 value, - int x, int y, int width, int height, -@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color, - screen->d_ptr->solidFill = solidFill_gray4; - break; - #endif -+#ifdef QT_QWS_DEPTH_2 -+ case 2: -+ screen->d_ptr->solidFill = solidFill_gray2; -+ break; -+#endif - #ifdef QT_QWS_DEPTH_1 - case 1: - screen->d_ptr->solidFill = solidFill_mono; -@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image, - } - #endif // QT_QWS_DEPTH_4 - -+#ifdef QT_QWS_DEPTH_2 -+ -+struct qgray2 { quint8 dummy; } Q_PACKED; -+ -+template <typename SRC> -+static inline quint8 qt_convertToGray2(SRC color); -+ -+template <> -+inline quint8 qt_convertToGray2(quint32 color) -+{ -+ return qGray(color) >> 6; -+} -+ -+template <> -+inline quint8 qt_convertToGray2(quint16 color) -+{ -+ const int r = (color & 0xf800) >> 11; -+ const int g = (color & 0x07e0) >> 6; // only keep 5 bit -+ const int b = (color & 0x001f); -+ return (r * 11 + g * 16 + b * 5) >> 8; -+} -+ -+template <> -+inline quint8 qt_convertToGray2(qrgb444 color) -+{ -+ return qt_convertToGray2(quint32(color)); -+} -+ -+template <> -+inline quint8 qt_convertToGray2(qargb4444 color) -+{ -+ return qt_convertToGray2(quint32(color)); -+} -+ -+template <typename SRC> -+static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src, -+ int x, int y, int width, int height, -+ int dstStride, int srcStride) -+{ -+ const int pixelsPerByte = 4; -+ quint8 *dest8 = reinterpret_cast<quint8*>(dest2) -+ + y * dstStride + x / pixelsPerByte; -+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3); -+ const int doAlign = (alignWidth > 0 ? 1 : 0); -+ const int alignStart = pixelsPerByte - 1 - (x & 3); -+ const int alignStop = alignStart - (alignWidth - 1); -+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop); -+ const int tailWidth = (width - alignWidth) & 3; -+ const int doTail = (tailWidth > 0 ? 1 : 0); -+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1; -+ const int width8 = (width - alignWidth) / pixelsPerByte; -+ -+ srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth); -+ dstStride -= (width8 + doAlign); -+ -+ for (int j = 0; j < height; ++j) { -+ if (doAlign) { -+ quint8 d = *dest8 & ~alignMask; -+ for (int i = alignStart; i >= alignStop; --i) -+ d |= qt_convertToGray2<SRC>(*src++) << (2 * i); -+ *dest8++ = d; -+ } -+ for (int i = 0; i < width8; ++i) { -+ *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6) -+ | (qt_convertToGray2<SRC>(src[1]) << 4) -+ | (qt_convertToGray2<SRC>(src[2]) << 2) -+ | (qt_convertToGray2<SRC>(src[3])); -+ src += 4; -+ ++dest8; -+ } -+ if (doTail) { -+ quint8 d = *dest8 & tailMask; -+ switch (tailWidth) { -+ case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2; -+ case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4; -+ case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6; -+ } -+ *dest8 = d; -+ } -+ -+ dest8 += dstStride; -+ src += srcStride; -+ } -+} -+ -+template <> -+void qt_rectconvert(qgray2 *dest, const quint32 *src, -+ int x, int y, int width, int height, -+ int dstStride, int srcStride) -+{ -+ qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height, -+ dstStride, srcStride); -+} -+ -+template <> -+void qt_rectconvert(qgray2 *dest, const quint16 *src, -+ int x, int y, int width, int height, -+ int dstStride, int srcStride) -+{ -+ qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height, -+ dstStride, srcStride); -+} -+ -+template <> -+void qt_rectconvert(qgray2 *dest, const qrgb444 *src, -+ int x, int y, int width, int height, -+ int dstStride, int srcStride) -+{ -+ qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height, -+ dstStride, srcStride); -+} -+ -+template <> -+void qt_rectconvert(qgray2 *dest, const qargb4444 *src, -+ int x, int y, int width, int height, -+ int dstStride, int srcStride) -+{ -+ qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height, -+ dstStride, srcStride); -+} -+ -+static void blit_2(QScreen *screen, const QImage &image, -+ const QPoint &topLeft, const QRegion ®ion) -+{ -+ switch (image.format()) { -+ case QImage::Format_ARGB32_Premultiplied: -+ blit_template<qgray2, quint32>(screen, image, topLeft, region); -+ return; -+ case QImage::Format_RGB16: -+ blit_template<qgray2, quint16>(screen, image, topLeft, region); -+ return; -+ case QImage::Format_RGB444: -+ blit_template<qgray2, qrgb444>(screen, image, topLeft, region); -+ return; -+ case QImage::Format_ARGB4444_Premultiplied: -+ blit_template<qgray2, qargb4444>(screen, image, topLeft, region); -+ return; -+ default: -+ qCritical("blit_2(): Image format %d not supported!", image.format()); -+ } -+} -+#endif // QT_QWS_DEPTH_2 -+ - #ifdef QT_QWS_DEPTH_1 - - struct qmono { quint8 dummy; } Q_PACKED; -@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image, - screen->d_ptr->blit = blit_4; - break; - #endif -+#ifdef QT_QWS_DEPTH_2 -+ case 2: -+ screen->d_ptr->blit = blit_2; -+ break; -+#endif - #ifdef QT_QWS_DEPTH_1 - case 1: - screen->d_ptr->blit = blit_1; -@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b) - } - } else if (d == 4) { - ret = qGray(r, g, b) >> 4; -+ } else if (d == 2) { -+ ret = qGray(r, g, b) >> 6; - } else if (d == 1) { - ret = qGray(r, g, b) >= 128; - } else { -@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const - } else if(d==1) { - return true; - #endif -+#ifdef QT_QWS_DEPTH_2 -+ } else if(d==2) { -+ return true; -+#endif - #ifdef QT_QWS_DEPTH_4 - } else if(d==4) { - return true; -diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp -index 6f3caad..14159ee 100644 ---- a/src/gui/embedded/qscreenlinuxfb_qws.cpp -+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp -@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec) - setupOffScreen(); - - // Now read in palette -- if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) { -- screencols= (vinfo.bits_per_pixel==8) ? 256 : 16; -+ if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) { -+ screencols= 1 << vinfo.bits_per_pixel; - int loopc; - ::fb_cmap startcmap; - startcmap.start=0; --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch deleted file mode 100644 index aa464fd1ed..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001 -From: Michael Lauer <mickey@vanille-media.de> -Date: Wed, 26 Sep 2012 20:41:32 +0200 -Subject: [PATCH 13/21] configure: add "-crossarch" option - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 79c1c7b..7983c3d 100755 ---- a/configure -+++ b/configure -@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do - shift - VAL=$1 - ;; -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do - DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` - DeviceVar set $DEV_VAR $DEV_VAL - ;; -+ crossarch) -+ CROSSARCH="$VAL" -+ ;; - debug-and-release) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_DEBUG_RELEASE="$VAL" -@@ -3324,6 +3327,8 @@ arm*) - ;; - esac - -+CFG_ARCH="$CROSSARCH" -+ - if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is supported" --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch deleted file mode 100644 index 66724a8ecf..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 21af8f6d21b28a53041affb11b58d6316023fa92 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 26 Sep 2012 20:45:10 +0200 -Subject: [PATCH 14/21] translations: fix phony translation linking error - - | .../usr/lib/crt1.o: In function `_start': - | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' - | collect2: ld returned 1 exit status - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - translations/translations.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/translations/translations.pro b/translations/translations.pro -index dc99beb..0d98829 100644 ---- a/translations/translations.pro -+++ b/translations/translations.pro -@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} - updateqm.CONFIG += no_link - QMAKE_EXTRA_COMPILERS += updateqm - --isEmpty(vcproj) { -+!isEmpty(vcproj) { - QMAKE_LINK = @: IGNORE THIS LINE - OBJECTS_DIR = - win32:CONFIG -= embed_manifest_exe -@@ -111,7 +111,7 @@ isEmpty(vcproj) { - phony_src.input = PHONY_DEPS - phony_src.output = phony.c - phony_src.variable_out = GENERATED_SOURCES -- phony_src.commands = echo int main() { return 0; } > phony.c -+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c - phony_src.name = CREATE phony.c - phony_src.CONFIG += combine - QMAKE_EXTRA_COMPILERS += phony_src --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch deleted file mode 100644 index b5db49128c..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9250fed086a4a8a645a972764a9bf34e4566ec2e Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fabo@debian.org> -Date: Wed, 26 Sep 2012 20:46:14 +0200 -Subject: [PATCH 15/21] configure: add nostrip for debug packages - -Qt is built in release mode and strip files by default. -Set CONFIG+=nostrip to avoid the stripping and -let dh_strip do it to generate debug packages. - -Upstream-Status: Inappropriate [Configuration] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index 7983c3d..d02824b 100755 ---- a/configure -+++ b/configure -@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" - cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" - -+QMakeVar add CONFIG nostrip -+ - QMakeVar add styles "cde mac motif plastique cleanlooks windows" - QMakeVar add decorations "default windows styled" - QMakeVar add mouse-drivers "pc" --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch deleted file mode 100644 index 9c3de47b4b..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 26 Sep 2012 20:47:08 +0200 -Subject: [PATCH 16/21] configure: eval QMAKE_CXX - -Allow expansion of $(...) references in QMAKE_CXX (currently its value -is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed -which allows WebKit to be enabled. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Conflicts: - configure ---- - configure | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index d02824b..891d6e7 100755 ---- a/configure -+++ b/configure -@@ -3409,7 +3409,8 @@ else - CFG_FRAMEWORK=no - fi - --QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` -+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` - TEST_COMPILER="$CXX" - - [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch deleted file mode 100644 index 9471966660..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d2bb701b551402f0befddd0e906423596bdc0df7 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 26 Sep 2012 20:48:37 +0200 -Subject: [PATCH 17/21] configure: ensure we identify the compiler as g++ in - configure - -Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure -script was interpreting from this that the compiler was "oe-g++" and -thus -g++ specific checks were not being run since this string did not match; -among other things this resulted in a compiler version check in the -QtWebKit build code not working, and hence the following error at build -time: - -./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword -in C++0x [-Werror=c++0x-compat] - -The easiest thing since our PLATFORM is entirely artificial is to just -force COMPILER to "g++" in the configure script if it is detected as -"oe-g++". - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure b/configure -index 891d6e7..7031898 100755 ---- a/configure -+++ b/configure -@@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then - else - COMPILER=`echo $PLATFORM | cut -f 2- -d-` - fi -+case $COMPILER in -+ *oe-g++) COMPILER="g++" ;; -+esac - if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then - CFG_EXCEPTIONS=no - fi --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch deleted file mode 100644 index 19cdd4c57d..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d6dc1a7d6594d7e395347732a3e553fc82ccab3d Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 18/21] configure: make pulseaudio a configurable option - -Allows disabling pulseaudio support within phonon at configure time. -(This is the Qt 4.8.0 version.) - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 7031898..a4a42f1 100755 ---- a/configure -+++ b/configure -@@ -1139,7 +1139,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style yes options -- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) -+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL=yes - ;; -@@ -2120,6 +2120,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ pulseaudio) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_PULSEAUDIO="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch deleted file mode 100644 index a83d2470a1..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Wed, 26 Sep 2012 20:54:38 +0200 -Subject: [PATCH 19/21] Fixes for gcc 4.7.0, particularly on qemux86 - -Origin: upstream, http://trac.webkit.org/changeset/93631 -Origin: upstream, http://trac.webkit.org/changeset/113848 - -Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 -Bug: https://bugs.webkit.org/show_bug.cgi?id=83584 - -RP 2012/04/30 - -Upstream-Status: Backport - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | 2 +- - src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | 2 +- - .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | 1 + - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp -index 32e47ca..b8e7389 100644 ---- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp -@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change) - { - // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. - RefPtr<RenderStyle> currentStyle(renderStyle()); -- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; -+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false; - bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); - bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); - -diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp -index d66075e..ab8f111 100644 ---- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp -@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document* - RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document)); - if (optionalWidth) - image->setWidth(*optionalWidth); -- if (optionalHeight > 0) -+ if (optionalHeight) - image->setHeight(*optionalHeight); - return image.release(); - } -diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h -index 6087ec3..6d748f6 100644 ---- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h -+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h -@@ -25,6 +25,7 @@ namespace WebCore { - #if ENABLE(TILED_BACKING_STORE) - class TiledBackingStoreClient { - public: -+ virtual ~TiledBackingStoreClient() { } - virtual void tiledBackingStorePaintBegin() = 0; - virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; - virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0; --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch deleted file mode 100644 index 92eddebaec..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d90b496f9ffdc828928ef84afad43260ea67ec1f Mon Sep 17 00:00:00 2001 -From: Ken Werner <ken.werner@linaro.org> -Date: Wed, 26 Sep 2012 20:55:21 +0200 -Subject: [PATCH 20/21] webkit: disable the -fuse-ld=gold flag - -This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error. - -Upstream-Status: Pending - -Signed-off-by: Ken Werner <ken.werner@linaro.org> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/3rdparty/webkit/Source/common.pri | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri -index 0f62e14..d81a1f0 100644 ---- a/src/3rdparty/webkit/Source/common.pri -+++ b/src/3rdparty/webkit/Source/common.pri -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch deleted file mode 100644 index dbc90227a5..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Wed, 5 Dec 2012 07:48:15 +0200 -Subject: [PATCH 21/21] configure: make qt4-native work with long building - path. - -Upstream-Status: Submitted - -Reference: https://bugreports.qt-project.org/browse/QTBUG-28292 - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 52 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/configure b/configure -index a4a42f1..2358563 100755 ---- a/configure -+++ b/configure -@@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST - TODAY=`date +%Y-%m-%d` - cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF - /* License Info */ --static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR"; --static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR"; -+static const char qt_configure_licensee_str [512 + 12] = "$LICENSE_USER_STR"; -+static const char qt_configure_licensed_products_str [512 + 12] = "$LICENSE_PRODUCTS_STR"; - - /* Installation date */ - static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY"; -@@ -4805,36 +4805,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then - - #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE) - /* Installation Info */ --static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR"; --static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR"; --static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR"; --static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR"; --static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR"; --static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR"; --static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR"; --static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR"; --static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR"; --static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR"; --static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR"; --static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR"; -+static const char qt_configure_prefix_path_str [512 + 12] = "$HOSTPREFIX_PATH_STR"; -+static const char qt_configure_documentation_path_str[512 + 12] = "$HOSTDOCUMENTATION_PATH_STR"; -+static const char qt_configure_headers_path_str [512 + 12] = "$HOSTHEADERS_PATH_STR"; -+static const char qt_configure_libraries_path_str [512 + 12] = "$HOSTLIBRARIES_PATH_STR"; -+static const char qt_configure_binaries_path_str [512 + 12] = "$HOSTBINARIES_PATH_STR"; -+static const char qt_configure_plugins_path_str [512 + 12] = "$HOSTPLUGINS_PATH_STR"; -+static const char qt_configure_imports_path_str [512 + 12] = "$HOSTIMPORTS_PATH_STR"; -+static const char qt_configure_data_path_str [512 + 12] = "$HOSTDATA_PATH_STR"; -+static const char qt_configure_translations_path_str [512 + 12] = "$HOSTTRANSLATIONS_PATH_STR"; -+static const char qt_configure_settings_path_str [512 + 12] = "$HOSTSETTINGS_PATH_STR"; -+static const char qt_configure_examples_path_str [512 + 12] = "$HOSTEXAMPLES_PATH_STR"; -+static const char qt_configure_demos_path_str [512 + 12] = "$HOSTDEMOS_PATH_STR"; - #else // QT_BOOTSTRAPPED - EOF - fi - - cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF - /* Installation Info */ --static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR"; --static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR"; --static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR"; --static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR"; --static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR"; --static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR"; --static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR"; --static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR"; --static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR"; --static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR"; --static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR"; --static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR"; -+static const char qt_configure_prefix_path_str [512 + 12] = "$PREFIX_PATH_STR"; -+static const char qt_configure_documentation_path_str[512 + 12] = "$DOCUMENTATION_PATH_STR"; -+static const char qt_configure_headers_path_str [512 + 12] = "$HEADERS_PATH_STR"; -+static const char qt_configure_libraries_path_str [512 + 12] = "$LIBRARIES_PATH_STR"; -+static const char qt_configure_binaries_path_str [512 + 12] = "$BINARIES_PATH_STR"; -+static const char qt_configure_plugins_path_str [512 + 12] = "$PLUGINS_PATH_STR"; -+static const char qt_configure_imports_path_str [512 + 12] = "$IMPORTS_PATH_STR"; -+static const char qt_configure_data_path_str [512 + 12] = "$DATA_PATH_STR"; -+static const char qt_configure_translations_path_str [512 + 12] = "$TRANSLATIONS_PATH_STR"; -+static const char qt_configure_settings_path_str [512 + 12] = "$SETTINGS_PATH_STR"; -+static const char qt_configure_examples_path_str [512 + 12] = "$EXAMPLES_PATH_STR"; -+static const char qt_configure_demos_path_str [512 + 12] = "$DEMOS_PATH_STR"; - EOF - - if [ ! -z "$QT_HOST_PREFIX" ]; then --- -1.8.0 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch deleted file mode 100644 index 8caef97405..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 -From: Peter Hartmann <phartmann@rim.com> -Date: Fri, 4 Jan 2013 11:06:14 +0100 -Subject: [PATCH] SSL certificates: blacklist mis-issued Turktrust certificates - -Those certificates have erroneously set the CA attribute to true, -meaning everybody in possesion of their keys can issue certificates on -their own. - -backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase - -Task-number: QTBUG-28937 -Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 -Reviewed-by: Richard J. Moore <rich@kde.org> - -Upstream-Status: Accepted https://codereview.qt-project.org/#change,43968 ---- - src/network/ssl/qsslcertificate.cpp | 3 ++ - ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++ - .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++ - 3 files changed, 58 insertions(+), 0 deletions(-) - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 038187f..37799d1 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { - - "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust - "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust -+ -+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate -+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate - 0 - }; - -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -new file mode 100644 -index 0000000..33f2ef4 ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -@@ -0,0 +1,24 @@ -+-----BEGIN CERTIFICATE----- -+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow -+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr -+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz -+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA -+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 -+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R -+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa -+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r -+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF -+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw -+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K -+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l -+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA -+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 -+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp -+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC -+pWfGWA== -+-----END CERTIFICATE----- -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -new file mode 100644 -index 0000000..e9d048f ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -@@ -0,0 +1,31 @@ -+-----BEGIN CERTIFICATE----- -+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow -+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB -+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE -+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V -+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF -+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO -+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q -+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N -+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS -+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G -+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF -+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF -+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t -+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd -+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy -+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz -+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy -+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn -+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV -+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj -+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU -+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 -+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I -+hQ== -+-----END CERTIFICATE----- --- -1.7.1 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch deleted file mode 100644 index 54171f7647..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 180bf94c241728dd6d6f100437914d3cb11cbc30 Mon Sep 17 00:00:00 2001 -From: Martin Petersson <Martin.Petersson@nokia.com> -Date: Wed, 7 Mar 2012 12:05:59 +0100 -Subject: [PATCH] QtNetwork: blacklist two more certificates - -The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 -certificate is a test certificate and the MD5 Collisions was created -as a proof of concept deliberately made to be expired at the time -of it's creation. - -Task-number: QTBUG-24654 -(cherry picked from commit 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5) - -Signed-off-by: Peter Hartmann <phartmann@rim.com> - -Apparently this commit was forgotten to cherry-pick to Qt 4. - -Change-Id: I86949eaa3c02483b0b66b4a620bfa88aaa9aa99b -Reviewed-by: Richard J. Moore <rich@kde.org> - -Upstream-Status: Accepted https://codereview.qt-project.org/#change,43992 ---- - src/network/ssl/qsslcertificate.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 37799d1..300a261 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,8 @@ static const char *certificate_blacklist[] = { - - "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust - "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust -+ "72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0", "UTN-USERFirst-Hardware", // comodogate test certificate -+ "41", "MD5 Collisions Inc. (http://www.phreedom.org/md5)", // http://www.phreedom.org/research/rogue-ca/ - - "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate - "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate --- -1.7.1 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch deleted file mode 100644 index 6c796a36c9..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> - -Upstream-Status: Accepted http://qt.gitorious.org/qt/qt/commit/20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - src/gui/image/qnativeimage.cpp | 2 +- - src/gui/image/qpixmap_x11.cpp | 2 +- - src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +- - src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +- - .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 2 +- - tools/qvfb/qvfbshmem.cpp | 4 ++-- - 8 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); -diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp -index 9654afe..fef38c5 100644 ---- a/src/gui/image/qnativeimage.cpp -+++ b/src/gui/image/qnativeimage.cpp -@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* - - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp -index 280d8bd..88c9b7b 100644 ---- a/src/gui/image/qpixmap_x11.cpp -+++ b/src/gui/image/qpixmap_x11.cpp -@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h) - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, - xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -index b6a42d8..0d56821 100644 ---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI - 0); - - m_shm_info.shmid = shmget (IPC_PRIVATE, -- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777); -+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600); - - m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0); - m_shm_info.shmseg = xcb_generate_id(xcb_connection()); -diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -index bf003eb..46a2f97 100644 ---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) - - - image_info->shminfo.shmid = shmget (IPC_PRIVATE, -- image->bytes_per_line * image->height, IPC_CREAT|0777); -+ image->bytes_per_line * image->height, IPC_CREAT|0700); - - image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0); - image_info->shminfo.readOnly = False; -diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp -index 7f9671f..84b6ebe 100644 ---- a/tools/qvfb/qvfbshmem.cpp -+++ b/tools/qvfb/qvfbshmem.cpp -@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, - uint data_offset_value = sizeof(QVFbHeader); - - int dataSize = bpl * h + data_offset_value; -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId != -1) - data = (unsigned char *)shmat(shmId, 0, 0); - else { - struct shmid_ds shm; - shmctl(shmId, IPC_RMID, &shm); -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId == -1) { - perror("QShMemViewProtocol::QShMemViewProtocol"); - qFatal("Cannot get shared memory 0x%08x", key); --- -1.7.1 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch deleted file mode 100644 index 498f14f69a..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch +++ /dev/null @@ -1,37 +0,0 @@ -From https://codereview.qt-project.org/p/qt/qt - * branch refs/changes/22/53322/2 -> FETCH_HEAD -From 28524b867ee8c9784f00eec0f07e4d9491a651b8 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Tue, 9 Apr 2013 16:41:23 -0700 -Subject: [PATCH] Remove unnecessary typedef, found by GCC 4.8 - -qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs] - -Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase) -Task-number: QTBUG-30594 -Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d - -Upstream-Status: Pending for 4.8.5 [1] - -[1] https://codereview.qt-project.org/#change,53322 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/corelib/concurrent/qtconcurrentfilter.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h -index 50b58bd..5a70182 100644 ---- a/src/corelib/concurrent/qtconcurrentfilter.h -+++ b/src/corelib/concurrent/qtconcurrentfilter.h -@@ -105,7 +105,6 @@ namespace QtConcurrent { - template <typename Sequence, typename KeepFunctor, typename ReduceFunctor> - ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce) - { -- typedef typename Sequence::const_iterator Iterator; - typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType; - return startThreadEngine(new KernelType(sequence, keep, reduce)); - } --- -1.7.4.4 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch deleted file mode 100644 index a37e35f980..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1c75ea0332054c420efd676c147e45eee43e0118 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <net147@gmail.com> -Date: Thu, 6 Jun 2013 12:42:13 +1000 -Subject: [PATCH] Don't overwrite QMAKE_QT_CONFIG with empty value - -If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten -with an empty value from .qmake.cache. Avoid this by first checking -if the value from .qmake.cache is not empty before assigning it to -QMAKE_QT_CONFIG. - -Upstream-Status: Submitted -https://codereview.qt-project.org/#change,58109 - -Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a -Signed-off-by: Jonathan Liu <net147@gmail.com> ---- - mkspecs/features/qt_config.prf | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf -index fc14cdd..e059b7e 100644 ---- a/mkspecs/features/qt_config.prf -+++ b/mkspecs/features/qt_config.prf -@@ -1,7 +1,11 @@ - # This file is loaded by the mkspecs, before .qmake.cache has been loaded. - # Consequently, we have to do some stunts to get values out of the cache. - --exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) -+exists($$_QMAKE_CACHE_) { -+ qdd = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) -+ !isEmpty(qdd): QMAKE_QT_CONFIG = $$qdd -+ unset(qdd) -+} - isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - qdd = $$QT_BUILD_TREE - isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) --- -1.8.2.3 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch deleted file mode 100644 index 6e30aeed02..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Wed, 3 Jul 2013 17:48:30 +0100 -Subject: [PATCH] tools.pro: disable qmeegographicssystemhelper - -We don't want this enabled just because we have EGL and OpenGL ES 2.0 -enabled. - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- - tools/tools.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tools.pro b/tools/tools.pro -index 0e27053..2d3f36d 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -49,4 +49,4 @@ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" - - !win32:!embedded:!mac:!symbian:CONFIG += x11 - --x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper -+#x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper --- -1.8.1.2 - diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf deleted file mode 100644 index 8755031017..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# qmake configuration for common gcc -# - -QMAKE_COMPILER = gcc - -QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) -QMAKE_CFLAGS_DEPS += -M -QMAKE_CFLAGS_WARN_ON += -Wall -W -QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -QMAKE_CFLAGS_DEBUG += -g -QMAKE_CFLAGS_SHLIB += -fPIC -QMAKE_CFLAGS_STATIC_LIB += -fPIC -QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} - -QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - -QMAKE_LINK = $(OE_QMAKE_LINK) -QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -QMAKE_LINK_C = $(OE_QMAKE_LINK) -QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) -QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) -QMAKE_LFLAGS_RELEASE += -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += -QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, - -QMAKE_PCH_OUTPUT_EXT = .gch - -# -Bsymbolic-functions (ld) support -QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions -QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, - -# do not depend on gdb -CONFIG -= gdb_dwarf_index - -# some linking helper... -CONFIG += rpath_libdirs - -# for the SDK -isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf deleted file mode 100644 index 86703813ca..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf +++ /dev/null @@ -1,66 +0,0 @@ -# -# qmake configuration for common linux -# - -QMAKE_CFLAGS_THREAD += -D_REENTRANT -QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = -QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_EGL = -QMAKE_LIBDIR_EGL = -QMAKE_INCDIR_OPENVG = -QMAKE_LIBDIR_OPENVG = - - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) -QMAKE_LIBS_NIS = -lnsl -QMAKE_LIBS_EGL = -lEGL -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -QMAKE_LIBS_OPENVG = -lOpenVG -QMAKE_LIBS_THREAD = -lpthread - -QMAKE_MOC = $(OE_QMAKE_MOC) -QMAKE_UIC = $(OE_QMAKE_UIC) -QMAKE_UIC3 = $(OE_QMAKE_UIC3) -QMAKE_RCC = $(OE_QMAKE_RCC) -QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) -QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) - -QMAKE_AR = $(OE_QMAKE_AR) cqs -QMAKE_OBJCOPY = objcopy -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -r -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = $(OE_QMAKE_STRIP) -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p -QMAKE_INSTALL_FILE = install -m 644 -p -QMAKE_INSTALL_PROGRAM = install -m 755 -p - -include(unix.conf) diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh deleted file mode 100644 index 21d6ecbd6a..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -e /dev/input/touchscreen0 ] -then - QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 - export QWS_MOUSE_PROTO -fi |