diff --git a/classes/qmake5.oeclass b/classes/qmake5.oeclass index 5b3d8d0..bf0cf4d 100644 --- a/classes/qmake5.oeclass +++ b/classes/qmake5.oeclass @@ -7,7 +7,11 @@ inherit qmake5_base inherit pkgconfig-install -QT5TOOLSDEPENDS ?= "native:qmake5_${PV}" +OE_QMAKE_PATH_HOST_BINS = "${HOST_SYSROOT}/${OE_QMAKE_PATH_BINS}" +OE_QMAKE_PATH_HOST_DATA = "${HOST_SYSROOT}/${OE_QMAKE_PATH_DATA}" +OE_QMAKE_PATH_HOST_LIBS = "${HOST_SYSROOT}/${OE_QMAKE_PATH_LIBS}" + +QT5TOOLSDEPENDS ?= "native:qmake5" CLASS_DEPENDS += "${QT5TOOLSDEPENDS} " addtask generateqtconfigfile after do_patch before do_configure @@ -32,29 +36,34 @@ Examples = ${OE_QMAKE_PATH_EXAMPLES} Tests = ${OE_QMAKE_PATH_TESTS} HostBinaries = ${OE_QMAKE_PATH_HOST_BINS} HostData = ${OE_QMAKE_PATH_HOST_DATA} +HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS} HostSpec = ${OE_QMAKESPEC} TartgetSpec = ${OE_XQMAKESPEC} +ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} Sysroot = ${STAGE_DIR}/machine/ EOF } -do_configure[prefuncs] += "do_configure_conf" -qmake5_base_do_configure () { +do_configure_qmake5_base () { ${OE_QMAKE_QMAKE} "`ls ${S}/*.pro`" } -qmake5_base_do_install() { +do_install_qmake5_base() { # Fix install paths for all - find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGE_DIR}/sysroot/,(INSTALL_ROOT),g" - find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGE_DIR}/machine/,(INSTALL_ROOT),g" + find -name "Makefile*" | xargs sed -i.oebak \ + -e "s,(INSTALL_ROOT)${STAGE_DIR}/sysroot/,(INSTALL_ROOT),g" \ + -e "s,(INSTALL_ROOT)${STAGE_DIR}/machine/,(INSTALL_ROOT),g" \ + -e "s,(INSTALL_ROOT)${OE_QMAKE_PATH_HOST_DATA},(INSTALL_ROOT)${OE_QMAKE_PATH_DATA},g" \ + -e "s,(INSTALL_ROOT)${OE_QMAKE_PATH_HOST_BINS},(INSTALL_ROOT)${OE_QMAKE_PATH_BINS},g" \ + -e "s,(INSTALL_ROOT)${OE_QMAKE_PATH_HOST_LIBS},(INSTALL_ROOT)${OE_QMAKE_PATH_LIBS},g" oe_runmake install INSTALL_ROOT=${D}/ } do_configure() { - qmake5_base_do_configure + do_configure_qmake5_base } do_install() { - qmake5_base_do_install + do_install_qmake5_base } diff --git a/classes/qmake5_base.oeclass b/classes/qmake5_base.oeclass index bb92efb..a2c5f80 100644 --- a/classes/qmake5_base.oeclass +++ b/classes/qmake5_base.oeclass @@ -3,8 +3,8 @@ ## Is used by recipes which compiles qmake # This is useful for target recipes to reference native mkspecs -QMAKE_MKSPEC_PATH_NATIVE = "${STAGE_DIR}/native/lib/${QT_DIR_NAME}" -QMAKE_MKSPEC_PATH_TARGET = "${STAGE_DIR}/machine/usr/share/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH_NATIVE = "${BUILD_SYSROOT}/lib" +QMAKE_MKSPEC_PATH_TARGET = "${TARGET_SYSROOT}/usr/share" QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" @@ -34,6 +34,7 @@ EXTRA_OEMAKE = " \ OE_QMAKE_AR='${OE_QMAKE_AR}' \ OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ + OE_QMAKE_INCDIR_QT='${HOST_SYSROOT}/${OE_QMAKE_PATH_HEADERS}' \ " OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" @@ -49,41 +50,27 @@ OE_QMAKE_LDFLAGS = "${LDFLAGS} -ldl" OE_QMAKE_AR = "${AR}" OE_QMAKE_STRIP = "echo" OE_QMAKE_WAYLAND_SCANNER = "${STAGE_DIR}/native/bin/wayland-scanner" -CLASS_FLAGS += "qt5_dir_name" -DEFAULT_USE_qt5_dir_name = "qt5" -QT_DIR_NAME ?= "${USE_qt5_dir_name}" # this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${SRCDIR}/qt.conf" OE_QMAKE_PATH_PREFIX = "${prefix}" -OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HEADERS = "${includedir}" OE_QMAKE_PATH_LIBS = "${libdir}" OE_QMAKE_PATH_ARCHDATA = "${libdir}" OE_QMAKE_PATH_DATA = "${datadir}" OE_QMAKE_PATH_BINS = "${bindir}" -OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec" -OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins" -OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports" -OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml" +OE_QMAKE_PATH_LIBEXECS = "${libdir}/libexec" +OE_QMAKE_PATH_PLUGINS = "${libdir}/plugins" +OE_QMAKE_PATH_IMPORTS = "${libdir}/imports" +OE_QMAKE_PATH_QML = "${libdir}/qml" OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" OE_QMAKE_PATH_DOCS = "${docdir}" OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" OE_QMAKE_PATH_TESTS = "${datadir}/tests" -OE_QMAKE_PATH_HOST_PREFIX = "" -OE_QMAKE_PATH_HOST_BINS = "${bindir}" -OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" - -OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_DATA = "${datadir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_BINS = "${bindir}" -OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" -OE_QMAKE_PATH_QT_DOCS = "${docdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" -OE_QMAKE_PATH_QT_TESTS = "${datadir}/${QT_DIR_NAME}/tests" +OE_QMAKE_PATH_HOST_PREFIX = "${prefix}" +OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${BUILD_SYSROOT}/bin" PRL_FILES ?= "${libdir}/*.prl" do_install[postfuncs] += "do_install_prl_fixup" @@ -107,4 +94,3 @@ def do_install_prl_fixup(d): with open(filename, "w") as output_file: output_file.write(prl_file) os.chdir(old_cwd) - diff --git a/classes/qmake_base.oeclass b/classes/qmake_base.oeclass deleted file mode 100644 index b331d25..0000000 --- a/classes/qmake_base.oeclass +++ /dev/null @@ -1,88 +0,0 @@ -## Class for recipes needing qmake (qt4.x) -## -## Is used by recipes which needs qmake. it sets up the correct -## paths, needed for generating makefiles using qmake, and aftwards -## needed variables for compilation. - -# -# QMake variables for Qt4 -# -CLASS_DEPENDS += "native:qmake_${PV}" -export QMAKESPEC = "${TARGET_SYSROOT}${target_datadir}/${OE_QMAKE_LIBS_QT}/mkspecs/${BUILD_CXX}" -QMAKESPEC:native = "" -export OE_QMAKE_UIC = "uic" -export OE_QMAKE_MOC = "moc" -export OE_QMAKE_RCC = "rcc" -export OE_QMAKE_QDBUSCPP2XML = "qdbuscpp2xml" -export OE_QMAKE_QDBUSXML2CPP = "qdbusxml2cpp" -export OE_QMAKE_LRELEASE = "lrelease" -export OE_QMAKE_LUPDATE = "lupdate" -export OE_QMAKE_QMAKE = "qmake" -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_LINK = "${CXX}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_INCDIR_QT = "${HOST_SYSROOT}${includedir}/${OE_QMAKE_LIBS_QT}" -export OE_QMAKE_LIBDIR_QT = "${HOST_SYSROOT}${libdir}" -export OE_QMAKE_LIBS_QT = "qt" - -# do not export STRIP to the environment -STRIP[unexport] = "1" - -# -# qt.conf overwrite paths hardcoded in the qmake binary. -# -# The qmake paths is used for fx the install targets. -# -# The Paths comnpiled into the libs (fx pluginpath) must be set, when running -# configure, use QT_PATH below to match the qmake paths. -# -QT_CONF_PATH = "${SRCDIR}/qt.conf" -export QT_CONF_PATH -do_configure[prefuncs] += "do_configure_conf" -do_configure_conf() { - echo "[Paths]" > $QT_CONF_PATH - echo "Prefix=${prefix}/" >> $QT_CONF_PATH - echo "Documentation=${docdir}/${OE_QMAKE_LIBS_QT}" >> $QT_CONF_PATH - echo "Headers=${includedir}/${OE_QMAKE_LIBS_QT}" >> $QT_CONF_PATH - echo "Libraries=${libdir}" >> $QT_CONF_PATH - echo "Binaries=${bindir}" >> $QT_CONF_PATH - echo "Plugins=${libdir}/${OE_QMAKE_LIBS_QT}/plugins" >> $QT_CONF_PATH - echo "Data=${datadir}/${OE_QMAKE_LIBS_QT}" >> $QT_CONF_PATH - echo "Translations=${datadir}/${OE_QMAKE_LIBS_QT}/translations" >> $QT_CONF_PATH - echo "Settings=${sysconfdir}/${OE_QMAKE_LIBS_QT}" >> $QT_CONF_PATH - echo "Examples=${bindir}/${OE_QMAKE_LIBS_QT}/examples" >> $QT_CONF_PATH - echo "Demos=${bindir}/${OE_QMAKE_LIBS_QT}/demos" >> $QT_CONF_PATH -} - - -QT_PATH = " \ - -prefix ${prefix}/ \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -datadir ${datadir}/${OE_QMAKE_LIBS_QT} \ - -sysconfdir ${sysconfdir}/${OE_QMAKE_LIBS_QT} \ - -docdir ${docdir}/${OE_QMAKE_LIBS_QT} \ - -headerdir ${includedir}/${OE_QMAKE_LIBS_QT} \ - -plugindir ${libdir}/${OE_QMAKE_LIBS_QT}/plugins \ -" - -do_configure_install_conf () { - if [ -z "${OE_QMAKE_CXX}" ]; then - echo "ERROR: cannot install $1 to $2, OE_QMAKE var not set" - exit 1 - fi - cp -vf "$1" "$2" - sed -i -e 's#\$\((OE_QMAKE_CXX)\)#${OE_QMAKE_CXX}#' \ - -i -e 's#\$\((OE_QMAKE_CC)\)#${OE_QMAKE_CC}#' \ - -i -e 's#\$\((OE_QMAKE_LINK)\)#${OE_QMAKE_LINK}#' \ - -i -e 's#\$\((OE_QMAKE_LDFLAGS)\)#${OE_QMAKE_LDFLAGS}#' \ - -i -e 's#\$\((OE_QMAKE_CFLAGS)\)#${OE_QMAKE_CFLAGS}#' \ - -i -e 's#\$\((OE_QMAKE_CXXFLAGS)\)#${OE_QMAKE_CXXFLAGS}#' \ - "$2" -} diff --git a/classes/qt5module.oeclass b/classes/qt5module.oeclass index 1e30872..bbcbd12 100644 --- a/classes/qt5module.oeclass +++ b/classes/qt5module.oeclass @@ -4,8 +4,7 @@ inherit c++ make qmake5 pkgconfig -OE_QMAKE_PATH_HOST_BINS = "${STAGE_DIR}/native/bin/" CLASS_DEPENDS += "\ - qtbase-dev_${PV} zlib-dev libpthread \ + qtbase-dev zlib-dev libpthread \ libdl libz librt libpng-dev libpng \ libgcc libgio libglib libgthread libm" diff --git a/recipes/qt4/files/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes/qt4/files/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index d8b0a09..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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 - #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/recipes/qt4/files/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/recipes/qt4/files/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch deleted file mode 100644 index 98fc887..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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 -+ -+/* 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 //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/recipes/qt4/files/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/recipes/qt4/files/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch deleted file mode 100644 index ecaea51..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/recipes/qt4/files/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch deleted file mode 100644 index 1eb8a58..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0004-no-qmake.patch b/recipes/qt4/files/0004-no-qmake.patch deleted file mode 100644 index 8661358..0000000 --- a/recipes/qt4/files/0004-no-qmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Sat, 2 Jun 2007 16:06:59 +0200 -Subject: [PATCH] no qmake - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: qt-embedded-linux-opensource-src-4.4.3/configure -=================================================================== ---- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100 -@@ -3786,7 +3786,7 @@ - } - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - OLD_QCONFIG_H= diff --git a/recipes/qt4/files/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/recipes/qt4/files/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch deleted file mode 100644 index 1a8f2b7..0000000 --- a/recipes/qt4/files/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?= -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 ---- - 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/recipes/qt4/files/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/recipes/qt4/files/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch deleted file mode 100644 index 90ebf75..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/recipes/qt4/files/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch deleted file mode 100644 index 7d3b336..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/recipes/qt4/files/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch deleted file mode 100644 index ec07f41..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/recipes/qt4/files/0009-qmake-fix-source-file-references-in-qmake.pri.patch deleted file mode 100644 index 45b8c10..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/recipes/qt4/files/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch deleted file mode 100644 index 1d2ddab..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0011-freetype-host-includes.patch b/recipes/qt4/files/0011-freetype-host-includes.patch deleted file mode 100644 index e0879c5..0000000 --- a/recipes/qt4/files/0011-freetype-host-includes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001 -From: Michael Krelin -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 -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0012-Add-2bpp-support.patch b/recipes/qt4/files/0012-Add-2bpp-support.patch deleted file mode 100644 index 8402eab..0000000 --- a/recipes/qt4/files/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?= -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 ---- - 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(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(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 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 -+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 -+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(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++) << (2 * i); -+ *dest8++ = d; -+ } -+ for (int i = 0; i < width8; ++i) { -+ *dest8 = (qt_convertToGray2(src[0]) << 6) -+ | (qt_convertToGray2(src[1]) << 4) -+ | (qt_convertToGray2(src[2]) << 2) -+ | (qt_convertToGray2(src[3])); -+ src += 4; -+ ++dest8; -+ } -+ if (doTail) { -+ quint8 d = *dest8 & tailMask; -+ switch (tailWidth) { -+ case 3: d |= qt_convertToGray2(src[2]) << 2; -+ case 2: d |= qt_convertToGray2(src[1]) << 4; -+ case 1: d |= qt_convertToGray2(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(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(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(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(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(screen, image, topLeft, region); -+ return; -+ case QImage::Format_RGB16: -+ blit_template(screen, image, topLeft, region); -+ return; -+ case QImage::Format_RGB444: -+ blit_template(screen, image, topLeft, region); -+ return; -+ case QImage::Format_ARGB4444_Premultiplied: -+ blit_template(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/recipes/qt4/files/0013-configure-add-crossarch-option.patch b/recipes/qt4/files/0013-configure-add-crossarch-option.patch deleted file mode 100644 index aa464fd..0000000 --- a/recipes/qt4/files/0013-configure-add-crossarch-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001 -From: Michael Lauer -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 ---- - 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/recipes/qt4/files/0014-translations-fix-phony-translation-linking-error.patch b/recipes/qt4/files/0014-translations-fix-phony-translation-linking-error.patch deleted file mode 100644 index 66724a8..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0015-configure-add-nostrip-for-debug-packages.patch b/recipes/qt4/files/0015-configure-add-nostrip-for-debug-packages.patch deleted file mode 100644 index b5db491..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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/recipes/qt4/files/0016-configure-eval-QMAKE_CXX.patch b/recipes/qt4/files/0016-configure-eval-QMAKE_CXX.patch deleted file mode 100644 index 9c3de47..0000000 --- a/recipes/qt4/files/0016-configure-eval-QMAKE_CXX.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -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 -Signed-off-by: Martin Jansa - -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/recipes/qt4/files/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/recipes/qt4/files/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch deleted file mode 100644 index 9471966..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0018-configure-make-pulseaudio-a-configurable-option.patch b/recipes/qt4/files/0018-configure-make-pulseaudio-a-configurable-option.patch deleted file mode 100644 index 19cdd4c..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/recipes/qt4/files/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch deleted file mode 100644 index a83d247..0000000 --- a/recipes/qt4/files/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 -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 ---- - 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 currentStyle(renderStyle()); -- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; -+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast(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::createForJSConstructor(Document* - RefPtr 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& paintedArea) = 0; --- -1.8.0 - diff --git a/recipes/qt4/files/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/recipes/qt4/files/0020-webkit-disable-the-fuse-ld-gold-flag.patch deleted file mode 100644 index 92eddeb..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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/recipes/qt4/files/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/recipes/qt4/files/0021-configure-make-qt4-native-work-with-long-building-pa.patch deleted file mode 100644 index dbc9022..0000000 --- a/recipes/qt4/files/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 -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 -Signed-off-by: Martin Jansa ---- - 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" <> "$outpath/src/corelib/global/qconfig.cpp.new" < -Date: Thu, 4 Jul 2013 16:20:40 +1000 -Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. - -This was broken by a previous fix which aimed to fix gaps in -polylines with tiny line segments. The result was that we -skipped updating the origin point when stroke() didn't produce -pixels which accidentally included the case of the line -being completely outside the deviceRect. I fixed this -by returning the value of clipLine in drawLine to the caller -so we could still update the origin for this case. - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,60427] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-31579 -Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 -(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) ---- - src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++++------------- - src/gui/painting/qcosmeticstroker_p.h | 2 +- - 2 files changed, 27 insertions(+), 17 deletions(-) - -diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp -index 0061ecb..4413170 100644 ---- a/src/gui/painting/qcosmeticstroker.cpp -+++ b/src/gui/painting/qcosmeticstroker.cpp -@@ -133,10 +133,15 @@ struct NoDasher { - - }; - -+/* -+ * The return value is the result of the clipLine() call performed at the start -+ * of each of the two functions, aka "false" means completely outside the devices -+ * rect. -+ */ - template --static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); -+static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); - template --static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); -+static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); - - inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage) - { -@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) - caps |= CapEnd; - - QCosmeticStroker::Point last = this->lastPixel; -- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); -+ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); - - /* fix for gaps in polylines with fastpen and aliased in a sequence - of points with small distances: if current point p2 has been dropped -- out, keep last non dropped point p. */ -- if (fastPenAliased) { -- if (last.x != lastPixel.x || last.y != lastPixel.y || -- points == begin + 2 || points == end - 2 ) { -- { -- p = p2; -- } -+ out, keep last non dropped point p. -+ -+ However, if the line was completely outside the devicerect, we -+ still need to update p to avoid drawing the line after this one from -+ a bad starting position. -+ */ -+ if (fastPenAliased && unclipped) { -+ if (last.x != lastPixel.x || last.y != lastPixel.y -+ || points == begin + 2 || points == end - 2) { -+ p = p2; - } - } else { - p = p2; -@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc) - the drawing shifts from horizontal to vertical or back. - */ - template --static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) -+static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) - { - if (stroker->clipLine(rx1, ry1, rx2, ry2)) -- return; -+ return false; - - static const int half = 31; - int x1 = toF26Dot6(rx1) + half; -@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, - } else { - // horizontal - if (!dx) -- return; -+ return true; - - QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight; - -@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, - } - } - stroker->lastPixel = last; -+ return true; - } - - - template --static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) -+static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) - { - if (stroker->clipLine(rx1, ry1, rx2, ry2)) -- return; -+ return false; - - int x1 = toF26Dot6(rx1); - int y1 = toF26Dot6(ry1); -@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx - } else { - // horizontal - if (!dx) -- return; -+ return true; - - int yinc = F16Dot16FixedDiv(dy, dx); - -@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx - drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6); - } - } -+ return true; - } - - QT_END_NAMESPACE -diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h -index 870738b..3216856 100644 ---- a/src/gui/painting/qcosmeticstroker_p.h -+++ b/src/gui/painting/qcosmeticstroker_p.h -@@ -56,7 +56,7 @@ QT_MODULE(Gui) - class QCosmeticStroker; - - --typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); -+typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); - - class QCosmeticStroker - { --- -1.8.3.2 - diff --git a/recipes/qt4/files/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes/qt4/files/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index c3c002e..0000000 --- a/recipes/qt4/files/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001 -From: Peter Hartmann -Date: Thu, 25 Jul 2013 12:05:29 -0400 -Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method - -When readData() is called repeatedly, we need to keep track which -part of the multipart message we are currently reading from. -Hereby we also need to take the boundary size into account, and not -only the size of the multipart; otherwise we would skip a not -completely read part. This would then later lead to advancing the -read pointer by negative indexes and data loss. - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61861] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-32534 -Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 -Reviewed-by: Jonathan Liu -Reviewed-by: Shane Kearns -(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529) -Reviewed-by: Thiago Macieira ---- - src/network/access/qhttpmultipart.cpp | 3 +- - tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+), 1 deletion(-) - -diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp -index 635129a..b25e917 100644 ---- a/src/network/access/qhttpmultipart.cpp -+++ b/src/network/access/qhttpmultipart.cpp -@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) - - // skip the parts we have already read - while (index < multiPart->parts.count() && -- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) -+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() -+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart - index++; - - // read the data --- -1.8.3.4 - diff --git a/recipes/qt4/files/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/recipes/qt4/files/0027-tools.pro-disable-qmeegographicssystemhelper.patch deleted file mode 100644 index 6e30aee..0000000 --- a/recipes/qt4/files/0027-tools.pro-disable-qmeegographicssystemhelper.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -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 ---- - 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/recipes/qt4/files/g++.conf b/recipes/qt4/files/g++.conf deleted file mode 100644 index 8755031..0000000 --- a/recipes/qt4/files/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/recipes/qt4/files/linux.conf b/recipes/qt4/files/linux.conf deleted file mode 100644 index d136aa5..0000000 --- a/recipes/qt4/files/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 = PLACEHOLDER_QMAKE_LIBS_OPENGL_EGL -QMAKE_LIBS_OPENGL = PLACEHOLDER_QMAKE_LIBS_OPENGL_OPENGL -QMAKE_LIBS_OPENGL_QT = PLACEHOLDER_QMAKE_LIBS_OPENGL_QT -QMAKE_LIBS_OPENGL_ES1 = PLACEHOLDER_QMAKE_LIBS_OPENGL_ES1 -QMAKE_LIBS_OPENGL_ES2 = PLACEHOLDER_QMAKE_LIBS_OPENGL_ES2 -QMAKE_LIBS_OPENVG = PLACEHOLDER_QMAKE_LIBS_OPENGL_OPENVG -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/recipes/qt4/files/qte.sh b/recipes/qt4/files/qte.sh deleted file mode 100644 index 39c3b2c..0000000 --- a/recipes/qt4/files/qte.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ -e /dev/input/touchscreen0 ] -then - QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 - export QWS_MOUSE_PROTO -fi - -QWS_KEYBOARD="" -export QWS_KEYBOARD \ No newline at end of file diff --git a/recipes/qt4/qmake.inc b/recipes/qt4/qmake.inc deleted file mode 100644 index 8ca6567..0000000 --- a/recipes/qt4/qmake.inc +++ /dev/null @@ -1,98 +0,0 @@ -LICENSE = "LGPLv2.1 | GPLv3" -inherit c++ make - -RECIPE_TYPES = "native sdk" - -SRC_URI += " \ - file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ - file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ - file://0021-configure-make-qt4-native-work-with-long-building-pa.patch" - -DEPENDS:>sdk = "native:qmake_${PV} libz libgcc libm libpthread libdl librt" -RDEPENDS:>sdk = "libz libgcc libm libpthread libdl librt" - -SRC_URI:>sdk += " file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch" - -require qt4-common.inc - -QT_CONFIG_FLAGS = "\ - -prefix '${prefix}' \ - -xplatform ${TARGET_OS}-g++ -platform ${TARGET_OS}-g++ \ - -arch ${QT_ARCH} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -datadir ${datadir}/qt4 \ - -sysconfdir ${sysconfdir}/qt4 \ - -docdir ${docdir}/qt4 \ - -headerdir ${includedir}/qt4 \ - -plugindir ${libdir}/qt4/plugins \ - -importdir ${libdir}/qt4/imports \ - -translationdir ${datadir}/qt4/translations \ - -examplesdir ${bindir}/qt4/examples \ - -demosdir ${bindir}/qt4/demos \ - -L ${STAGE_DIR}/native/usr/lib \ - -I ${STAGE_DIR}/native/usr/include \ - -qt-libjpeg -system-zlib \ - -no-libjpeg -no-libpng -no-libmng -no-libtiff \ - -no-accessibility \ - -no-cups \ - -no-nas-sound \ - -no-nis -no-openssl \ - -verbose -release \ - -embedded -no-freetype -no-glib -no-iconv \ - -exceptions -xmlpatterns \ - -qt3support \ - -no-fast -silent -no-rpath" - -QMAKE_CONFIGURE_PREFUNCS = "" -QMAKE_CONFIGURE_PREFUNCS:sdk = "do_configure_qmake_fixup" -do_configure[prefuncs] += "${QMAKE_CONFIGURE_PREFUNCS}" - -#Qt expects a native qmake in ${SRC}/bin/ -do_configure_qmake_fixup() { - if [ ! -e bin/qmake ]; then - ln -sf ${BUILD_SYSROOT}/${stage_bindir}/qmake bin/qmake - fi -} - -do_configure() { - : -} - -TOBUILD = "\ - src/tools/bootstrap \ - src/tools/moc \ - src/tools/uic \ - src/tools/rcc \ -" - -do_compile() { - if [ "${BUILD_ENDIAN}" = "l" ]; then - BENDIAN_CONFIG="-host-little-endian" - else - BENDIAN_CONFIG="-host-big-endian" - fi - - if [ "${HOST_ENDIAN}" = "l" ]; then - HENDIAN_CONFIG="-little-endian" - else - HENDIAN_CONFIG="-big-endian" - fi - ENDIAN_CONFIG="$BENDIAN_CONFIG $HENDIAN_CONFIG" - (echo o; echo yes) | NO_CONF="yes" ./configure ${QT_CONFIG_FLAGS} $ENDIAN_CONFIG - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" LINK="${CXX}" - done -} - -do_install() { - install -d ${D}${bindir}/ - install -m 0755 bin/moc ${D}${bindir}/ - install -m 0755 bin/uic ${D}${bindir}/ - install -m 0755 bin/rcc ${D}${bindir}/ - install -m 0755 bin/qmake ${D}${bindir}/ -} - -PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN} += "${bindir}/.qmake" diff --git a/recipes/qt4/qmake/only-qmake.patch b/recipes/qt4/qmake/only-qmake.patch deleted file mode 100644 index dfb2f46..0000000 --- a/recipes/qt4/qmake/only-qmake.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qt-everywhere-opensource-src-4.7.4/configure -=================================================================== ---- qt-everywhere-opensource-src-4.7.4.orig/configure 2012-01-31 13:13:04.741790839 +0100 -+++ qt-everywhere-opensource-src-4.7.4/configure 2012-01-31 13:13:18.622545309 +0100 -@@ -4726,6 +4726,7 @@ - [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake - [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h - [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -+ [ "$QMAKE_BUILD_ERROR" = "no" ] && [ "$NO_CONF" = "yes" ] && exit 0 - fi # Build qmake - - #------------------------------------------------------------------------------- diff --git a/recipes/qt4/qmake_4.8.5.oe b/recipes/qt4/qmake_4.8.5.oe deleted file mode 100644 index 803748b..0000000 --- a/recipes/qt4/qmake_4.8.5.oe +++ /dev/null @@ -1,4 +0,0 @@ -## Recipe for building qmake (qt 4.x) -## - -require ${PN}.inc diff --git a/recipes/qt4/qmake_4.8.5.oe.sig b/recipes/qt4/qmake_4.8.5.oe.sig deleted file mode 120000 index fb14e33..0000000 --- a/recipes/qt4/qmake_4.8.5.oe.sig +++ /dev/null @@ -1 +0,0 @@ -qt-embedded_4.8.5.oe.sig \ No newline at end of file diff --git a/recipes/qt4/qt-4.8.5.inc b/recipes/qt4/qt-4.8.5.inc deleted file mode 100644 index 0bd45ab..0000000 --- a/recipes/qt4/qt-4.8.5.inc +++ /dev/null @@ -1,65 +0,0 @@ -LICENSE = "LGPLv2.1 GPLv3" - -FILESPATHPKG =. "qt-${PV}:" - -SRC_URI += "\ - file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ - file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ - file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \ - file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \ - file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \ - file://0011-freetype-host-includes.patch \ - file://0012-Add-2bpp-support.patch \ - file://0013-configure-add-crossarch-option.patch \ - file://0014-translations-fix-phony-translation-linking-error.patch \ - file://0015-configure-add-nostrip-for-debug-packages.patch \ - file://0016-configure-eval-QMAKE_CXX.patch \ - file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \ - file://0018-configure-make-pulseaudio-a-configurable-option.patch \ - file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ - file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ - file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \ - file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ - file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ - file://g++.conf \ - file://linux.conf " - -SRC_URI:>USE_qt_embedded = "file://qte.sh" -SRC_URI:>USE_qt_imx_codecs += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" - -RECIPE_FLAGS += "qt_imx_codecs" -RDEPENDS_${PN}:>USE_qt_imx_codecs = " gst-fsl-plugin" - -SRC_URI:>USE_qt_xinput2 = " \ - file://meego-mtev-add-xinput2-support.patch \ - file://qt-everywhere-opensource-src-4.7.2-meego-add_scaling_based_on_screen_size.patch \ - file://qt-everywhere-opensource-src-4.7.2-meego-adapt_XInput2.0_code_to_support_multiple_devices.patch" - -RECIPE_FLAGS += "qt_xinput2" -DEPENDS:>USE_qt_xinput2 = " libxi inputproto" -RDEPENDS_${PN}-libqtgui:>USE_qt_xinput2 = " libxi" -DEPENDS_${PN}-libqtgui:>USE_qt_xinput2 = " libxi" -QT_CONFIG_FLAGS:>USE_qt_xinput2 += " -xinput2 -xinput -xrender" - -do_configure[prefuncs] += "do_configure_smallfix" -do_configure_smallfix() { - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += "-no-rpath -reduce-relocations -silent ${QT_GLFLAGS}" - -do_install[postfuncs] += "do_install_smallfix" -do_install_smallfix() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} - -FILES_${PN}-tools += "${bindir}/qml" diff --git a/recipes/qt4/qt-embedded_4.8.5.oe b/recipes/qt4/qt-embedded_4.8.5.oe deleted file mode 100644 index 8272478..0000000 --- a/recipes/qt4/qt-embedded_4.8.5.oe +++ /dev/null @@ -1,10 +0,0 @@ -## Recipe for building qt (qt 4.x) embedded version -## -## Overwrites for qt is set up in qt4.inc - -require qt4.inc -require qt-${PV}.inc - -DEFAULT_USE_qt_embedded = "1" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE:USE_qt_embedded = "1" diff --git a/recipes/qt4/qt-embedded_4.8.5.oe.sig b/recipes/qt4/qt-embedded_4.8.5.oe.sig deleted file mode 100644 index 30586ff..0000000 --- a/recipes/qt4/qt-embedded_4.8.5.oe.sig +++ /dev/null @@ -1 +0,0 @@ -745f9ebf091696c0d5403ce691dc28c039d77b9e qt-everywhere-opensource-src-4.8.5.tar.gz diff --git a/recipes/qt4/qt-x11_4.8.5.oe b/recipes/qt4/qt-x11_4.8.5.oe deleted file mode 100644 index 87ee27d..0000000 --- a/recipes/qt4/qt-x11_4.8.5.oe +++ /dev/null @@ -1,27 +0,0 @@ -## Recipe for building qt (qt 4.x) x11 version -## -## Overwrites for qt is set up in qt4.inc -## -## @useflag qt_fontconfig Enables qt config. Disabled by default. - -require qt4.inc -require qt-${PV}.inc -include conf/fonts.conf - -RECIPE_FLAGS += "qt_fontconfig" -FONTCONFIG = "-no-fontconfig" -FONTCONFIG:USE_qt_fontconfig = "-fontconfig" -QT_CONFIG_FLAGS += "${FONTCONFIG}" - -DEPENDS:>USE_qt_fontconfig = " libfontconfig" -DEPENDS_${PN}-libqtgui:>USE_qt_fontconfig = " libfontconfig" -RDEPENDS_${PN}-libqtgui:>USE_qt_fontconfig += " libfontconfig" -PACKAGES:>USE_qt_fontconfig = " ${PN}-fonts" -FILES_${PN}-fonts = "${fontdir}" -EXTRA_INSTALL:>USE_qt_fontconfig = " do_install_ttffonts" -do_install_ttffonts() { - install -d -m 0755 ${D}/${fontdir}/ttf - install -m 0644 lib/fonts/*.ttf ${D}/${fontdir}/ttf/ -} -DEPENDS_${PN}-libqtgui += "libx11 libxext libxrandr" -RDEPENDS_${PN}-libqtgui += "libx11 libxext libxrandr" diff --git a/recipes/qt4/qt-x11_4.8.5.oe.sig b/recipes/qt4/qt-x11_4.8.5.oe.sig deleted file mode 120000 index fb14e33..0000000 --- a/recipes/qt4/qt-x11_4.8.5.oe.sig +++ /dev/null @@ -1 +0,0 @@ -qt-embedded_4.8.5.oe.sig \ No newline at end of file diff --git a/recipes/qt4/qt4-common.inc b/recipes/qt4/qt4-common.inc deleted file mode 100644 index cf5820b..0000000 --- a/recipes/qt4/qt4-common.inc +++ /dev/null @@ -1,64 +0,0 @@ -# Supported archs in src/corelib/arch/* - -SRC_URI =+ "http://download.qt-project.org/archive/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz" -S = "${SRCDIR}/qt-everywhere-opensource-src-${PV}" - -FILESPATHPKG =. "qt-${PV}:" -LD[unexport] = "1" - -CONFIGURE_PREFUNCS = "do_configure_mkspecs" -do_configure[prefuncs] += "${CONFIGURE_PREFUNCS}" - -do_configure_mkspecs() { - if [ ! -e mkspecs/${TARGET_OS}-g++ ]; then - ln -sf linux-g++ mkspecs/${TARGET_OS}-g++ - fi - - if [ -f ${SRCDIR}/g++.conf ] && [ -f ${SRCDIR}/linux.conf ]; then - do_configure_install_conf "${SRCDIR}/g++.conf" \ - "mkspecs/common/g++-unix.conf" - cp -vf ${SRCDIR}/linux.conf mkspecs/common/ - fi -} - -do_configure() { - oe_runmake confclean || echo "Ignoring clean erro" - if [ ! -e bin/qmake ]; then - ln -sf ${BUILD_SYSROOT}/${stage_bindir}/qmake bin/qmake - fi - - (echo o; echo yes) | ./configure ${QT_CONFIG_FLAGS} || die "Configuring qt failed. cmdl was ${QT_CONFIG_FLAGS}" - -} - -#Map Arch to QT Arch -QT_ARCHS = "alpha arm armv6 avr32 bfin generic i386 ia64 mips parisc powerpc \ -s390 sh sh4a sparc x86_64 \ -" -QT_ARCHS[nohash] = "1" - -QT_ARCH = "${@map_qt_arch(d, 'HOST_ARCH')}" -QT_ARCH[import] = "map_qt_arch" - -def map_qt_arch(d, arch): - import bb, re - arch = d.get(arch) - valid_archs = d.get("QT_ARCHS") - - (arch,march) = re.split('-', arch)[0:2] - - if re.match("i.86$", arch): - return "i386" - elif re.match("arm", arch): - if re.match("1136", march): - return "armv6" - else: - return "arm" - elif arch == "x86_64": - return arch - elif arch == "mipsel": - return "mips" - - if arch in valid_archs: return arch - else: - bb.error("cannot map '%s' to a qt architecture" % arch) diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc deleted file mode 100644 index a856ab8..0000000 --- a/recipes/qt4/qt4.inc +++ /dev/null @@ -1,344 +0,0 @@ -## Common file for building qt 4.x for both embedded and x11 -## -## Commonalities for qt embedded and x11 is in here. -## -## @useflag qt_embedded Use qt embedded version. Default is set to 1. -## @useflag qt_opengl Use qt opengl. The useflag is default set to -no-opengl, -## which disables opengl. Other options are _only_ glesv1, glesv2, or -## desktop. -## @useflag qt_opengl_egl_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -lEGL. -## @useflag qt_opengl_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -LGLU -lGL. -## @useflag qt_opengl_qt_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -lGL. -## @useflag qt_opengl_es1_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -lGLES_CM. -## @useflag qt_opengl_es2_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -lGLESv2. -## @useflag qt_opengl_openvg_flags If @useflag qt_opengl is set, use the flags -## specified in this useflag. Default set to -lOpenVG. -## @useflag qt_dbus Enabled qt dbus. Disabled by default. -## @useflag qt_demos Enables qt examples and demos. Default disabled. Requires -## @useflag qt_tools to be set to 1. -## @useflag qt_svg Enabled qt svg functionality. Disabled by default. -## @useflag qt_webkit Enable qt webkit. Default disabled. -## @useflag qt_tools Enable qt tools. Default disabled. -## @useflag qt_cursor Enable qt cursor. Default enabled. Requires @useflag -## qt_tools to be set to 1. -## @useflag qt_gstreamer Enable qt gstreamer. Default disabled. -## @useflag qt_xinput2 Enable xinput2. Default disabled. -## @useflag qt_imx_codecs Enable imx codecs. Default disabled. - -SUMMARY = "Qt is a versatile cross-platform application framework" -LICENSE = "LGPLv2.1 | GPLv3" -HOMEPAGE = "http://qt-project.org/" - -inherit qmake_base -inherit c++ make pkgconfig -require qt4-common.inc -RECIPE_TYPES = "machine sdk" - -PROVIDES_${PN} = "qt" -PROVIDES_${PN}-dev = "qt-dev" - -export OE_QMAKE_INCDIR_QT = "${HOST_SYSROOT}${includedir}/${OE_QMAKE_LIBS_QT}" -export OE_QMAKE_LIBDIR_QT = "${HOST_SYSROOT}${libdir}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_EXTRA_MODULES = "network" - -RECIPE_FLAGS += "qt_embedded" - -OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm -lXrender -lXfixes" -OE_QMAKE_LIBS_X11:USE_qt_embedded = "" -export OE_QMAKE_LIBS_X11 - -################################## -### DEPENDS -################################## - -QT_DEPENDS = "\ - libx11 libxft \ - libxext libxrender libxrandr libxcursor \ - freetype" -QT_DEPENDS:USE_qt_embedded = "libdirectfb" -DEPENDS += "${QT_DEPENDS}" - -DEPENDS += "\ - native:qmake_${PV} native:glib \ - libfreetype libjpeg libpng12 libz libssl \ - libgio libglib libgthread \ - libm libpthread libdl librt libgcc \ - libxml2" - -################################## -### RDEPENDS -################################## - -QT_LIB_RDEPENDS = "\ - libx11 libxrandr libxfixes \ - libxrender libxext" -QT_LIB_RDEPENDS:USE_qt_embedded = "libdirectfb libts tslib-calibrate" - -RDEPENDS_${PN} += "${QT_LIB_RDEPENDS}" - -################################## -### CONFIGURE -################################## - -QT_CONFIG_FLAGS += "\ - -v -release -reduce-relocations -shared \ - -qt-libjpeg -qt-libpng -system-zlib -stl -glib \ - -force-pkg-config \ - -depths all \ - -prefix '${prefix}/' \ - -crossarch ${QT_ARCH} \ - -xplatform ${TARGET_OS}-g++ -platform ${TARGET_OS}-g++ \ - -fast \ - -I${STAGE_DIR}/sysroot/usr/include/freetype2" - -QT_CONFIG_FLAGS += "\ - -no-sql-ibase -no-sql-mysql -no-sql-odbc \ - -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -no-pch \ - -no-nas-sound \ - -no-sm \ - -no-nis \ - -no-cups \ - -no-accessibility \ - -no-javascript-jit \ - -no-qt3support \ - -no-audio-backend \ - -nomake docs -nomake translations" - -QTE_CONFIG = " \ - -no-xinerama -no-xkb \ - -no-embedded \ - -xrandr \ - -x11" - -QTE_CONFIG:USE_qt_embedded = "\ - -qt-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ - -qt-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ - -qt-kbd-tty \ - -qt-kbd-linuxinput \ - -DQT_KEYPAD_NAVIGATION \ - -embedded" - -QT_CONFIG_FLAGS += "${QTE_CONFIG} \ - -exceptions \ - ${QT_PATH}" - -################################## -### Enable-able features -################################## - -RECIPE_FLAGS += "qt_opengl" -DEFAULT_USE_qt_opengl = "" -addhook parse_qt_opengl_config to post_recipe_parse first after set_useflags before auto_package_utils auto_package_libs -def parse_qt_opengl_config(d): - qt_opengl = d.get("USE_qt_opengl") - if not qt_opengl or qt_opengl == "-no-opengl": - d.set("QT_OPENGL_CONFIG_OPTION","-no-opengl") - d.set("USE_qt_opengl","") - elif qt_opengl == "glesv1": - d.set("QT_OPENGL_DEPENDS","libglesv1 libegl") - d.set("QT_OPENGL_CONFIG_OPTION","-opengl es -egl") - elif qt_opengl == "glesv2": - d.set("QT_OPENGL_DEPENDS","libglesv2 libegl") - d.set("QT_OPENGL_CONFIG_OPTION","-opengl es2 -egl") - elif qt_opengl == "desktop": - d.set("QT_OPENGL_DEPENDS","libgl") - d.set("QT_OPENGL_CONFIG_OPTION","-opengl desktop") - else : - print "ERROR! Wrong qt opengl option" - return False - return True - -#Overwritten by above function -QT_OPENGL_DEPENDS = "" -QT_OPENGL_CONFIG_OPTION = "" - -RECIPE_FLAGS += "opengl \ - qt_opengl_egl_flags qt_opengl_flags \ - qt_opengl_qt_flags qt_opengl_es1_flags \ - qt_opengl_es2_flags qt_opengl_openvg_flags" -DEPENDS += " ${QT_OPENGL_DEPENDS}" -QT_CONFIG_FLAGS += "${QT_OPENGL_CONFIG_OPTION}" -DEFAULT_USE_qt_opengl_egl_flags = "-lEGL" -DEFAULT_USE_qt_opengl_flags = "-lGLU -lGL" -DEFAULT_USE_qt_opengl_qt_flags = "-lGL" -DEFAULT_USE_qt_opengl_es1_flags = "-lGLES_CM" -DEFAULT_USE_qt_opengl_es2_flags = "-lGLESv2" -DEFAULT_USE_qt_opengl_openvg_flags = "-lOpenVG" -QT_OPENGL_FIXUP_FUNCS = "" -QT_OPENGL_FIXUP_FUNCS:USE_qt_opengl = "do_configure_opengl_libs" -do_configure[prefuncs] =+ "${QT_OPENGL_FIXUP_FUNCS}" -do_configure_opengl_libs () { - sed -i \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_EGL$:${USE_qt_opengl_egl_flags}:g" \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_OPENGL$:${USE_qt_opengl_flags}:g" \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_QT$:${USE_qt_opengl_qt_flags}:g" \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_ES1$:${USE_qt_opengl_es1_flags}:g" \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_ES2$:${USE_qt_opengl_es2_flags}:g" \ - -e "s:PLACEHOLDER_QMAKE_LIBS_OPENGL_OPENVG$:${USE_qt_opengl_openvg_flags}:g" \ - ${SRCDIR}/linux.conf -} - -RECIPE_FLAGS += "qt_dbus" -QT_DBUS_CONFIG = "" -QT_DBUS_CONFIG:USE_qt_dbus = " -qdbus" -QT_CONFIG_FLAGS += "${QT_DBUS_CONFIG}" -DEPENDS:>USE_qt_dbus += "dbus-libdbus dbus" - -RECIPE_FLAGS += "qt_demos" -DEMOS = "-nomake examples -nomake demos" -DEMOS:USE_qt_demos = "\ - -make examples -make demos \ - -examplesdir ${bindir}/${OE_QMAKE_LIBS_QT}/examples \ - -demosdir ${bindir}/${OE_QMAKE_LIBS_QT}/demos" -QT_CONFIG_FLAGS += "${DEMOS}" -RDEPENDS_${PN}-demos += "${PN}" - -RECIPE_FLAGS += "qt_svg" -SVG_CONFIG = "-no-svg" -SVG_CONFIG:USE_qt_svg = "-svg" -QT_CONFIG_FLAGS += "${SVG_CONFIG}" - -RECIPE_FLAGS += "qt_webkit" -WEBKIT_CONFIG = "-no-webkit" -WEBKIT_CONFIG:USE_qt_webkit = "" -QT_CONFIG_FLAGS += "${WEBKIT_CONFIG}" - -RECIPE_FLAGS += "qt_alsa" -DEPENDS:>USE_qt_alsa += " libasound" -RDEPENDS_${PN}:>USE_qt_alsa += " libasound" - -RECIPE_FLAGS += "qt_tools" -TOOLS_CONFIG = "-nomake tools" -TOOLS_CONFIG:USE_qt_tools = "-make tools" -QT_CONFIG_FLAGS += "${TOOLS_CONFIG}" - -RECIPE_FLAGS += "qt_cursor" -CURSOR_CONFIG = "-no-feature-CURSOR" -CURSOR_CONFIG:USE_qt_cursor = "" -DEFAULT_USE_qt_cursor = "1" -QT_CONFIG_FLAGS += "${TOOLS_CONFIG}" - -RECIPE_FLAGS += "qt_gstreamer" -GSTREAMER_CONFIG = "-no-gstreamer" -GSTREAMER_CONFIG:USE_qt_gstreamer = "" -QT_CONFIG_FLAGS += "${GSTREAMER_CONFIG}" -DEPENDS:>USE_qt_gstreamer += " gstreamer libgstbase" -RDEPENDS_${PN}:>USE_qt_gstreamer += " gstreamer libgstbase" - -################################## -### Install -################################## - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - rm ${D}/${bindir}/qmake - install -d ${D}${libdir}/${OE_QMAKE_LIBS_QT} - mv ${D}/usr/imports ${D}${libdir}/${OE_QMAKE_LIBS_QT}/ - - ln -sf linux-g++ ${D}${datadir}/${OE_QMAKE_LIBS_QT}/mkspecs/${BUILD_CXX} - cp -f ${SRCDIR}/linux.conf ${D}${datadir}/${OE_QMAKE_LIBS_QT}/mkspecs/common/ - cp -f ${SRCDIR}/g++.conf ${D}${datadir}/${OE_QMAKE_LIBS_QT}/mkspecs/common/g++-unix.conf -} - -QTE_INSTALL = "" -QTE_INSTALL:USE_qt_embedded = "do_install_fixsysconfdir" -EXTRA_INSTALL ?= "" - -do_install[postfuncs] += "${QTE_INSTALL} ${EXTRA_INSTALL}" -do_install_fixsysconfdir() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${SRCDIR}/qte.sh ${D}${sysconfdir}/profile.d/ -} - -################################## -### Packaging -################################## - -inherit auto-package-utils - -AUTO_PACKAGE_UTILS += "\ - assistant designer lconvert linguist lrelease \ - lupdate makeqpf moc pixeltool qcollectiongenerator qdbus \ - qdbuscpp2xml qdbusviewer qdbusxml2cpp qdoc3 qhelpconverter \ - qhelpgenerator qmlviewer qt3to4 qttracereplay rcc uic \ - xmlpatterns xmlpatternsvalidator" - -inherit auto-package-libs -AUTO_PACKAGE_LIBS += "\ - QtNetwork QtCLucene QtDeclarative \ - QtScript QtScriptTools phonon \ - QtSql QtGui QtDesignerComponents \ - QtXml QtDesigner QtXmlPatterns \ - QtCore QtDBus QtMultimedia \ - QtTest QtHelp" -AUTO_PACKAGE_LIBS:>USE_opengl += " QtOpenGL QtMeeGoGraphicsSystemHelper" - -AUTO_PACKAGE_LIBS_RDEPENDS += "libdl libm libgcc libc libstdc++ libpthread" -AUTO_PACKAGE_LIBS_DEV_DEPENDS += "libdl libm libgcc libc libstdc++ libpthread" - -PACKAGES =+ "${PN}-mkspecs ${PN}-prl" -PACKAGES:USE_opengl += " libegl libglesv1 libglesv2" -RDEPENDS_${PN}-libqtmeegographicssystemhelper += " \ - libqtopengl libqtgui libqtcore libglesv2" - -FILES_${PN}-libphonon += "${libdir}/${OE_QMAKE_LIBS_QT}/plugins/phonon_backend" -FILES_${PN}-libphonon-dbg += "${libdir}/${OE_QMAKE_LIBS_QT}/plugins/phonon_backend/.debug" -FILES_${PN}-libqtgui += "${libdir}/${OE_QMAKE_LIBS_QT}/plugins/imageformats" -FILES_${PN}-libqtgui-dbg += "${libdir}/${OE_QMAKE_LIBS_QT}/plugins/imageformats/.debug" -FILES_${PN}:>USE_qt_embedded += " ${sysconfdir}/profile.d/qte.sh" -FILES_${PN} += "${libdir}/fonts/*" -FILES_${PN} += "${libdir}/${OE_QMAKE_LIBS_QT}" -FILES_${PN}-mkspecs = "${datadir}/${OE_QMAKE_LIBS_QT}/" -FILES_${PN}-prl = "${libdir}/*.prl" -FILES_${PN}-demos = "${bindir}/${OE_QMAKE_LIBS_QT}/examples \ -${bindir}/${OE_QMAKE_LIBS_QT}/demos" -FILES_${PN}-demos-dbg = " \ - ${bindir}/${OE_QMAKE_LIBS_QT}/examples/*/*/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/demos/*/*/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/examples/*/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/demos/*/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/examples/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/demos/*/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/examples/*/.debug \ - ${bindir}/${OE_QMAKE_LIBS_QT}/demos/*/.debug" diff --git a/recipes/qt5/qmake5-5.3.1.inc b/recipes/qt5/qmake5-5.3.1.inc deleted file mode 100644 index d687c7b..0000000 --- a/recipes/qt5/qmake5-5.3.1.inc +++ /dev/null @@ -1,14 +0,0 @@ -inherit qmake5_base - -RECIPE_TYPES = "native sdk" - -# we don't want conflicts with qt4 -OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" -OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}" -OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}" -OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}" -OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}" -OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}" -OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" -OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" -OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" diff --git a/recipes/qt5/qmake5-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes/qt5/qmake5-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 78fb3c6..0000000 --- a/recipes/qt5/qmake5-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8a14a69d5b0078554ed002e682c72e995b1e6320 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending - again a bit OE specific ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 7e61845..29c6358 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() - configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - configStream << "}" << endl; - configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes/qt5/qmake5-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch deleted file mode 100644 index 182de79..0000000 --- a/recipes/qt5/qmake5-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* in situation like this: - QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm - QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib - QT_INSTALL_LIBS/raw:/usr/lib - QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib - - I don't want the replacement like this: - sed - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" - "../../lib/pkgconfig/Qt5Core.pc" - >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc" - because that way I'll end with -L/usr/lib in .pc file which is - cross-compile unfriendly, keeping ${libdir}/${includedir} works better - in my case - -* qt_module: Fix paths in .prl files -* qmake does not prefix them with QT_SYSROOT when using them - so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE - variable, which is unsafe for cross-compilation -* writting QT_SYSROOT in .prl files is dangerous for sstate when - builds are in different directories, so we need - SSTATE_SCAN_FILES += "*.pri *.prl" - to make them relocateble - -* fix paths in packageconfig files - This reverts parts of: - - enable path replacement in installed prl files on all platforms - - Task-number: QTBUG-33794 - Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b - Reviewed-by: Joerg Bornemann - -* to debug this, rebuild qtbase and read build/src/corelib/Makefile -* this is example of broken install_target rule (added line feeds): - -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g - -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g' - -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g' - "../../lib/pkgconfig/Qt5Core.pc" - >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc" - change .prf files, create copy of WORKDIR, re-excecute only - do_configure task and compare generated Makefile, repeat until - replace in generated Makefile works ok, then refresh patch and - try complete rebuild for qtbase -* if everything is ok, then try: - image $ grep -R "\-L/usr" . - image $ grep -R "\-I/usr" . - and it should return only few cases of - qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads - for aix* platformas - -Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c -Signed-off-by: Martin Jansa -Signed-off-by: Andreas Müller ---- - mkspecs/features/qt_common.prf | 2 +- - mkspecs/features/qt_module.prf | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4dcabe9..d04bc3e 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qt_libdir -+ lib_replace.replace = "\$$\\{libdir}" - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 8bf4c92..ee2e989 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -188,10 +188,25 @@ unix|mingw { - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module - QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace - -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_include_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace -+ - unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$qt_libdir - QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace -+ # add '=' as sysroot in .la files -+ lafile_replace.match = "-L\$${libdir}" -+ lafile_replace.replace = "-L=\$$\\{libdir}" -+ lafile_replace.CONFIG = path -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace -+ # drop -L/usr/lib in .prl files -+ prl_replace.match = "-L\$${libdir}" -+ prl_replace.replace = "" -+ prl_replace.CONFIG = path -+ QMAKE_PRL_INSTALL_REPLACE += prl_replace - } - } - --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes/qt5/qmake5-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch deleted file mode 100644 index 0e3bc99..0000000 --- a/recipes/qt5/qmake5-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ca212fd10a95b2c694f3c89c3f22a2b0ae185198 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 21 Apr 2014 19:22:04 +0200 -Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode" - -This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. ---- - src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- - src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp -index 5eed470..39c7c1f 100644 ---- a/src/platformsupport/eglconvenience/qeglconvenience.cpp -+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp -@@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) - for (index = 0; attrs[index].attr != -1; ++index) { - EGLint value; - if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { -- qDebug("\t%s: %d", attrs[index].name, (int)value); -+ qWarning("\t%s: %d\n", attrs[index].name, (int)value); - } - } -+ -+ qWarning("\n"); - } - - #ifdef Q_OS_LINUX -diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -index eec6463..4a7c69b 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -@@ -44,7 +44,6 @@ - #include "qeglpbuffer_p.h" - #include - #include --#include - - QT_BEGIN_NAMESPACE - -@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont - return; - } - -- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt(); -- if (printConfig) { -- qDebug() << "Created context for format" << format << "with config:"; -- q_printEglConfig(m_eglDisplay, m_eglConfig); -- } -- - #ifndef QT_NO_OPENGL - // Make the context current to ensure the GL version query works. This needs a surface too. - const EGLint pbufferAttributes[] = { --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes/qt5/qmake5-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch deleted file mode 100644 index 1f029a2..0000000 --- a/recipes/qt5/qmake5-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d61189d1706d3367eada4e7db6f2c6c167130ce Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h - -Signed-off-by: Martin Jansa ---- - src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -index f665455..9eb783c 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -@@ -46,6 +46,12 @@ - #include - #include - -+// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ -+// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */ -+#ifdef CursorShape -+#undef CursorShape -+#endif -+ - QT_BEGIN_NAMESPACE - - class QEGLPlatformScreen; --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch b/recipes/qt5/qmake5-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch deleted file mode 100644 index b1c4690..0000000 --- a/recipes/qt5/qmake5-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 107fe67947ced65315550e6a7795be24efaab371 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters - -Increase the path length that gets hardcoded into generated config.cpp file -from 256 to 512 characters, as nativesdk path can be quite long. - -Signed-off-by: Denys Dmytriyenko ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 48d5119..3c0347a 100755 ---- a/configure -+++ b/configure -@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ - static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; - - /* Installation Info */ --static const char qt_configure_prefix_path_strs[][256 + 12] = { -+static const char qt_configure_prefix_path_strs[][512 + 12] = { - #ifndef QT_BUILD_QMAKE - "qt_prfxpath=$QT_SYSROOT_PREFIX", - "qt_docspath=$QT_SYSROOT_DOCS", --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes/qt5/qmake5-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch deleted file mode 100644 index cbd0bcd..0000000 --- a/recipes/qt5/qmake5-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one - window/surface -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -running qmlscene -platform eglfs .qml - -caused - -EGL Error : Could not create the egl surface: error = 0x3003 - -Rebased version of [1-2] - -Upstream-Status: unknown - -[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch -[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch - -Signed-off-by: Andreas Müller -Signed-off-by: Martin Jansa ---- - src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp -index 2d36c0b..854531e 100644 ---- a/src/plugins/platforms/eglfs/qeglfswindow.cpp -+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp -@@ -74,6 +74,15 @@ void QEglFSWindow::create() - - m_flags = Created; - -+ static EGLSurface __singleWindowSurface; -+ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) { -+ m_surface = __singleWindowSurface; -+#ifdef QEGL_EXTRA_DEBUG -+ qWarning("Surface recreate request, re-using %x\n", m_surface); -+#endif -+ return; -+ } -+ - if (window()->type() == Qt::Desktop) - return; - -@@ -85,7 +94,7 @@ void QEglFSWindow::create() - if (isRaster() && screen->compositingWindow()) - return; - --#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) -+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) - // We can have either a single OpenGL window or multiple raster windows. - // Other combinations cannot work. - qFatal("EGLFS: OpenGL windows cannot be mixed with others."); -@@ -105,6 +114,11 @@ void QEglFSWindow::create() - - resetSurface(); - -+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows)) -+ { -+ __singleWindowSurface = m_surface; -+ } -+ - screen->setPrimarySurface(m_surface); - - if (isRaster()) { --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes/qt5/qmake5-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch deleted file mode 100644 index da05f28..0000000 --- a/recipes/qt5/qmake5-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8d8db9db8518289f4c1856dd3062c2e324c5c9be Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 4 Jun 2014 15:26:11 +0200 -Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf" - -This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. ---- - mkspecs/features/simd.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf -index 62a63f9..4f86f60 100644 ---- a/mkspecs/features/simd.prf -+++ b/mkspecs/features/simd.prf -@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) - # - # Set up compilers for SIMD (SSE/AVX, NEON etc) - # --gcc { # includes intel_icc and clang variants -+*-g++*|intel_icc|*-clang*|*-qcc* { - sse2 { - HEADERS += $$SSE2_HEADERS - --- -2.0.0 - diff --git a/recipes/qt5/qmake5-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch b/recipes/qt5/qmake5-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch deleted file mode 100644 index 27496db..0000000 --- a/recipes/qt5/qmake5-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support - -Allows creating QOpenGLPaintDevice targetting sub-area -of binded framebuffer. - -Upstream-Status: Pending - -Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 - -Signed-off-by: Martin Jansa ---- - src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ - src/gui/opengl/qopenglpaintdevice.h | 2 ++ - src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- - src/gui/opengl/qopenglpaintengine_p.h | 1 + - src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- - 5 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index 6750458..034630a 100644 ---- a/src/gui/opengl/qopenglpaintdevice.cpp -+++ b/src/gui/opengl/qopenglpaintdevice.cpp -@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate - public: - QOpenGLPaintDevicePrivate(const QSize &size); - -+ QPoint offset; - QSize size; - QOpenGLContext *ctx; - -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) - { - } - -+QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height) -+ : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height))) -+{ -+ d_ptr->offset = QPoint(x,y); -+} -+ - /*! - Destroys the QOpenGLPaintDevice. - */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const - return d_ptr->ctx; - } - -+QPoint QOpenGLPaintDevice::offset() const -+{ -+ return d_ptr->offset; -+} -+ - /*! - Returns the pixel size of the paint device. - -diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index c05571c..01eb1bc 100644 ---- a/src/gui/opengl/qopenglpaintdevice.h -+++ b/src/gui/opengl/qopenglpaintdevice.h -@@ -62,12 +62,14 @@ public: - QOpenGLPaintDevice(); - explicit QOpenGLPaintDevice(const QSize &size); - QOpenGLPaintDevice(int width, int height); -+ QOpenGLPaintDevice(int x, int y, int width, int height); - virtual ~QOpenGLPaintDevice(); - - int devType() const { return QInternal::OpenGL; } - QPaintEngine *paintEngine() const; - - QOpenGLContext *context() const; -+ QPoint offset() const; - QSize size() const; - void setSize(const QSize &size); - void setDevicePixelRatio(qreal devicePixelRatio); -diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 81a0d82..ce57261 100644 ---- a/src/gui/opengl/qopenglpaintengine.cpp -+++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) - for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) - d->vertexAttributeArraysEnabledState[i] = false; - -+ const QPoint offset = d->device->offset(); - const QSize sz = d->device->size(); -+ d->x = offset.x(); -+ d->y = offset.y(); - d->width = sz.width(); - d->height = sz.height(); - d->mode = BrushDrawingMode; -@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive() - d->device->ensureActiveTarget(); - - d->transferMode(BrushDrawingMode); -- d->funcs.glViewport(0, 0, d->width, d->height); -+ d->funcs.glViewport(d->x, d->y, d->width, d->height); - d->needsSync = false; - d->lastMaskTextureUsed = 0; - d->shaderManager->setDirty(); -@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() - if (bounds == QRect(0, 0, width, height)) { - funcs.glDisable(GL_SCISSOR_TEST); - } else { -+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()); - funcs.glEnable(GL_SCISSOR_TEST); - setScissor(bounds); - } -@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() - - void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) - { -- const int left = rect.left(); -+ const int left = rect.left() + x; - const int width = rect.width(); - int bottom = height - (rect.top() + rect.height()); - if (device->paintFlipped()) { - bottom = rect.top(); - } -+ bottom += y; - const int height = rect.height(); - - funcs.glScissor(left, bottom, width, height); -diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index 4f0e2e5..f211de1 100644 ---- a/src/gui/opengl/qopenglpaintengine_p.h -+++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: - QOpenGL2PaintEngineEx* q; - QOpenGLEngineShaderManager* shaderManager; - QOpenGLPaintDevice* device; -+ int x, y; - int width, height; - QOpenGLContext *ctx; - EngineMode mode; -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 0610ab6..ea1e3b2 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); - - if (pex != 0) { -- funcs->glViewport(0, 0, pex->width, pex->height); -+ funcs->glViewport(pex->x, pex->y, pex->width, pex->height); - pex->updateClipScissorTest(); - } else { - if (m_vao.isCreated()) { --- -2.0.2 - diff --git a/recipes/qt5/qmake5-5.3.1/mingw-disable-vars-from-shell.patch b/recipes/qt5/qmake5-5.3.1/mingw-disable-vars-from-shell.patch deleted file mode 100644 index fec12c3..0000000 --- a/recipes/qt5/qmake5-5.3.1/mingw-disable-vars-from-shell.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- qtbase-opensource-src-5.3.1/configure.old 2014-08-20 11:44:41.900337499 +0200 -+++ qtbase-opensource-src-5.3.1/configure 2014-08-20 11:46:46.724341019 +0200 -@@ -324,16 +324,6 @@ - getSingleQMakeVariable "$1" "$specvals" - } - --# OE qmake.conf is reading some variables from shell env --# read them from qmake.conf, replace qmake () syntax with shell and eval --getQEvalMakeConf() --{ -- VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` -- EVAL=`eval "echo ${VAL}"` --# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2 -- eval "echo ${VAL}" --} -- - getXQMakeConf() - { - if [ -z "$xspecvals" ]; then -@@ -343,16 +333,6 @@ - getSingleQMakeVariable "$1" "$xspecvals" - } - --# OE qmake.conf is reading some variables from shell env --# read them from qmake.conf, replace qmake () syntax with shell and eval --getXQEvalMakeConf() --{ -- VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` -- EVAL=`eval "echo ${VAL}"` --# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2 -- eval "echo ${VAL}" --} -- - compilerSupportsFlag() - { - cat >conftest.cpp <&2 --fi'` -- eval "$cmd" --done -- - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" -@@ -3158,7 +3126,7 @@ - [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no - fi - --QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` - - TEST_COMPILER=$QMAKE_CONF_COMPILER - -@@ -3193,7 +3161,7 @@ - exit 1 - fi - fi --TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS` -+TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS` - - GCC_MACHINE_DUMP= - case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3651,14 +3619,6 @@ - getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" - } - --# OE qmake.conf is reading some variables from shell env --# read them from qmake.conf, replace qmake () syntax with shell and eval --setBootstrapEvalVariable() --{ -- getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" --} -- -- - # build qmake - if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." -@@ -3697,14 +3657,14 @@ - fi - - [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= -- setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -- setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -- setBootstrapEvalVariable QMAKE_CFLAGS -- setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS -- setBootstrapEvalVariable QMAKE_CXXFLAGS -- setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -- setBootstrapEvalVariable QMAKE_LFLAGS -- setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS -+ setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapVariable QMAKE_CFLAGS -+ setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS -+ setBootstrapVariable QMAKE_CXXFLAGS -+ setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -+ setBootstrapVariable QMAKE_LFLAGS -+ setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS - - if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE diff --git a/recipes/qt5/qmake5-5.3.1/mingw-manually-enable-msys.patch b/recipes/qt5/qmake5-5.3.1/mingw-manually-enable-msys.patch deleted file mode 100644 index 2c6bd3a..0000000 --- a/recipes/qt5/qmake5-5.3.1/mingw-manually-enable-msys.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qtbase-opensource-src-5.1.1/configure.old 2014-03-11 13:41:46.362623481 +0100 -+++ qtbase-opensource-src-5.1.1/configure 2014-03-11 13:42:18.250624617 +0100 -@@ -445,7 +445,7 @@ - BUILD_ON_MAC=yes - PLATFORM_MAC=maybe - fi --BUILD_ON_MSYS=no -+BUILD_ON_MSYS=yes - HOST_DIRLIST_SEP=":" - DEV_NULL=/dev/null - if [ "$OSTYPE" = "msys" ]; then diff --git a/recipes/qt5/qmake5-5.3.1/mingw-spec.patch b/recipes/qt5/qmake5-5.3.1/mingw-spec.patch deleted file mode 100644 index 78a024c..0000000 --- a/recipes/qt5/qmake5-5.3.1/mingw-spec.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qtbase-opensource-src-5.1.1/mkspecs/win32-g++/qmake.conf~orig 2014-03-10 13:18:52.166561069 +0100 -+++ qtbase-opensource-src-5.1.1/mkspecs/win32-g++/qmake.conf 2014-03-10 13:18:50.222561071 +0100 -@@ -13,7 +13,7 @@ - QMAKE_PLATFORM = win32 mingw - CONFIG += debug_and_release debug_and_release_target precompile_header - DEFINES += UNICODE --QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 -+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 Q_OS_WIN - - QMAKE_EXT_OBJ = .o - QMAKE_EXT_RES = _res.o -@@ -25,7 +25,7 @@ - QMAKE_LEXFLAGS = - QMAKE_YACC = byacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport -+QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport -DUNICODE -D_UNICODE - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -Wextra - QMAKE_CFLAGS_WARN_OFF = -w diff --git a/recipes/qt5/qmake5-5.3.1/qtbug-33155-mingw-w64-compilation.patch b/recipes/qt5/qmake5-5.3.1/qtbug-33155-mingw-w64-compilation.patch deleted file mode 100644 index 9d1f1b3..0000000 --- a/recipes/qt5/qmake5-5.3.1/qtbug-33155-mingw-w64-compilation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e59a5f9fdcec5df2f54e88d75a75fcb4a2fe577b Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Mon, 26 Aug 2013 11:52:47 +0200 -Subject: [PATCH] Windows: Fix compilation with MinGW-64, gcc 4.8.1 - -A definition for FILE_ID_128 was added. - -Change-Id: Ifdfe5da1b15a90afdf5cf09d92838a04b1cf5c19 -Reviewed-by: Kai Koehne ---- - src/corelib/io/qfilesystemengine_win.cpp | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp -index e8904b0..57231b5 100644 ---- a/src/corelib/io/qfilesystemengine_win.cpp -+++ b/src/corelib/io/qfilesystemengine_win.cpp -@@ -573,9 +573,12 @@ typedef enum { Q_FileIdInfo = 18 } Q_FILE_INFO_BY_HANDLE_CLASS; - - # if defined(Q_CC_MINGW) || (defined(Q_CC_MSVC) && _MSC_VER < 1700) - -+// MinGW-64 defines FILE_ID_128 as of gcc-4.8.1 along with FILE_SUPPORTS_INTEGRITY_STREAMS -+# if !(defined(Q_CC_MINGW) && defined(FILE_SUPPORTS_INTEGRITY_STREAMS)) - typedef struct _FILE_ID_128 { - BYTE Identifier[16]; - } FILE_ID_128, *PFILE_ID_128; -+# endif // !(Q_CC_MINGW && FILE_SUPPORTS_INTEGRITY_STREAMS) - - typedef struct _FILE_ID_INFO { - ULONGLONG VolumeSerialNumber; -@@ -614,7 +617,8 @@ QByteArray fileIdWin8(HANDLE handle) - &infoEx, sizeof(FILE_ID_INFO))) { - result = QByteArray::number(infoEx.VolumeSerialNumber, 16); - result += ':'; -- result += QByteArray((char *)infoEx.FileId.Identifier, sizeof(infoEx.FileId.Identifier)).toHex(); -+ // Note: MinGW-64's definition of FILE_ID_128 differs from the MSVC one. -+ result += QByteArray((char *)&infoEx.FileId, sizeof(infoEx.FileId)).toHex(); - } - } - return result; --- -1.7.1 - diff --git a/recipes/qt5/qmake5-5.6.0.inc b/recipes/qt5/qmake5-5.6.0.inc new file mode 100644 index 0000000..b8e7b33 --- /dev/null +++ b/recipes/qt5/qmake5-5.6.0.inc @@ -0,0 +1,7 @@ +inherit qmake5_base + +RECIPE_TYPES = "native sdk" + +OE_QMAKE_PATH_HOST_BINS = "${BUILD_SYSROOT}/bin" +OE_QMAKE_PATH_HOST_DATA = "${BUILD_SYSROOT}/lib" +OE_QMAKE_PATH_HOST_LIBS = "${BUILD_SYSROOT}/lib" diff --git a/recipes/qt5/qmake5-5.3.1/0001-Add-linux-oe-g-platform.patch b/recipes/qt5/qmake5-5.6.0/0001-Add-linux-oe-g-platform.patch similarity index 84% rename from recipes/qt5/qmake5-5.3.1/0001-Add-linux-oe-g-platform.patch rename to recipes/qt5/qmake5-5.6.0/0001-Add-linux-oe-g-platform.patch index eca6b36..68c3987 100644 --- a/recipes/qt5/qmake5-5.3.1/0001-Add-linux-oe-g-platform.patch +++ b/recipes/qt5/qmake5-5.6.0/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 9c7d71880c6ec5b07e3030b7c7a23e004d5c60a2 Mon Sep 17 00:00:00 2001 +From bf8e0e2292c8a9233d55714aab5eb780c62a132d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/12] Add linux-oe-g++ platform +Subject: [PATCH 01/10] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -37,24 +37,29 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform /bin/sh: line 0: test: -gt: unary operator expected which are not fatal, but still misleading in do_configure output +* add -target suffix to qmake built in qtbase configure, this way we can + use qmake from qtbase-native, but then include qmake built for target + in qtbase-tools package (smilarly for nativesdk-qtbase). + Upstream-Status: Inappropriate [embedded specific] too OE specific, probably cannot be upstreamed +Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa --- - configure | 66 ++++++++++++++++------- + configure | 71 ++++++++++++++++--------- mkspecs/features/configure.prf | 4 +- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 4 files changed, 188 insertions(+), 22 deletions(-) + 4 files changed, 189 insertions(+), 28 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index d5c2b08..4eae0d3 100755 +index f247401..011cd70 100755 --- a/configure +++ b/configure -@@ -324,6 +324,16 @@ getQMakeConf() +@@ -342,6 +342,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -71,7 +76,7 @@ index d5c2b08..4eae0d3 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -333,6 +343,16 @@ getXQMakeConf() +@@ -351,6 +361,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -88,37 +93,38 @@ index d5c2b08..4eae0d3 100755 compilerSupportsFlag() { cat >conftest.cpp <&2 fi'` eval "$cmd" done -+ -+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" -@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi @@ -127,7 +133,7 @@ index d5c2b08..4eae0d3 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi @@ -136,7 +142,7 @@ index d5c2b08..4eae0d3 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3633,6 +3651,14 @@ setBootstrapVariable() +@@ -3976,6 +3986,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -151,7 +157,7 @@ index d5c2b08..4eae0d3 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -172,13 +178,21 @@ index d5c2b08..4eae0d3 100755 + setBootstrapEvalVariable QMAKE_LFLAGS + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS - if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then + if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE +@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ + \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" + EXEEXT= ++ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target + fi + if [ "$BUILD_ON_MAC" = "yes" ]; then + echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index fe41c54..e2db923 100644 +index 6b37a04..dcf6025 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -60,12 +60,12 @@ defineTest(qtCompileTest) { +@@ -63,12 +63,12 @@ defineTest(qtCompileTest) { } # Clean up after previous run @@ -187,7 +201,7 @@ index fe41c54..e2db923 100644 mkpath($$test_out_dir)|error("Aborting.") - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { log("yes$$escape_expand(\\n)") @@ -195,10 +209,10 @@ index fe41c54..e2db923 100644 write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..ca26b10 +index 0000000..311ba04 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,40 @@ +@@ -0,0 +1,42 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -224,7 +238,7 @@ index 0000000..ca26b10 +include(../common/g++-unix.conf) + +# tc settings from g++-base.conf -+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) ++QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CXX = $(OE_QMAKE_CXX) + @@ -238,6 +252,8 @@ index 0000000..ca26b10 +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) + ++include(../oe-device-extra.pri) ++ +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 @@ -346,5 +362,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.0.0 +2.7.1 diff --git a/recipes/qt5/qmake5-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes/qt5/qmake5-5.6.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch similarity index 78% rename from recipes/qt5/qmake5-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch rename to recipes/qt5/qmake5-5.6.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 29f788e..3884c9c 100644 --- a/recipes/qt5/qmake5-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes/qt5/qmake5-5.6.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From ad884ab378939e685a3b00af03bb6875d9bdc1d5 Mon Sep 17 00:00:00 2001 +From 0d1049d3097f674260622adeb9ae8c5f4d6d0a44 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/10] 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 @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6d25325..80e0f30 100644 +index 8bcacca..e1c87b5 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() +@@ -157,7 +157,10 @@ void QLibrarySettings::load() QSettings *QLibraryInfoPrivate::findConfiguration() { @@ -31,9 +31,9 @@ index 6d25325..80e0f30 100644 + QString qtconfig = QFile::decodeName(config); + if(!QFile::exists(qtconfig)) + qtconfig = QStringLiteral(":/qt/etc/qt.conf"); - #ifdef QT_BOOTSTRAPPED - if(!QFile::exists(qtconfig)) - qtconfig = qt_libraryInfoFile(); + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + #ifdef QT_BUILD_QMAKE -- -2.0.0 +2.7.1 diff --git a/recipes/qt5/qmake5-5.6.0/0003-Add-external-hostbindir-option.patch b/recipes/qt5/qmake5-5.6.0/0003-Add-external-hostbindir-option.patch new file mode 100644 index 0000000..f7feaec --- /dev/null +++ b/recipes/qt5/qmake5-5.6.0/0003-Add-external-hostbindir-option.patch @@ -0,0 +1,229 @@ +From 8bc74542bab1f29dfb4a0e5a2af2f8d91f049579 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 03/10] Add -external-hostbindir option + +* when cross-compiling it's sometimes useful to use existing tools from machine + (or in OpenEmbedded built with separate native recipe) when building for target + +* this way we can skip bootstraping tools we already have + +* qt_functions: temporary remove isEmpty check +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value +* isEmpty works correctly only with qmake variables (e.g. $$FOO - + isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. + +* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries + +Upstream-Status: Pending + is a lot better for upstreaming (and it was already sort of approved by + Oswald) but in 5.2.0 I've noticed that he added something similar for + android builds + +Signed-off-by: Martin Jansa +Signed-off-by: Simon Busch +Signed-off-by: Jonathan Liu + +Conflicts: + configure +--- + configure | 14 ++++++++++++++ + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 5 +++-- + qtbase.pro | 13 ++++++++++--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 7 files changed, 38 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 011cd70..d30b6e5 100755 +--- a/configure ++++ b/configure +@@ -810,6 +810,7 @@ QT_HOST_BINS= + QT_HOST_LIBS= + QT_HOST_DATA= + QT_EXT_PREFIX= ++QT_EXTERNAL_HOST_BINS= + + #flags for SQL drivers + QT_CFLAGS_PSQL= +@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do + -testsdir| \ + -hostdatadir| \ + -hostbindir| \ ++ -external-hostbindir| \ + -hostlibdir| \ + -extprefix| \ + -sysroot| \ +@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do + extprefix) + QT_EXT_PREFIX="$VAL" + ;; ++ external-hostbindir) ++ QT_EXTERNAL_HOST_BINS="$VAL" ++ ;; + pkg-config) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PKGCONFIG="$VAL" +@@ -2428,6 +2433,10 @@ Installation options: + -hostdatadir . Data used by qmake will be installed to + (default HOSTPREFIX) + ++ -external-hostbindir Use external host executables instead of building them ++ (not used by defaut) ++ ++ + Configure options: + + The defaults (*) are usually acceptable. A plus (+) denotes a default value +@@ -3172,6 +3181,11 @@ fi + # command line and environment validation + #------------------------------------------------------------------------------- + ++# default is empty, don't call makeabs if it is empty ++if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then ++ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"` ++fi ++ + # update QT_CONFIG to show our current predefined configuration + CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h + case "$CFG_QCONFIG" in +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index b2c2507..fba4a58 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -57,7 +57,11 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] ++ isEmpty(QT_EXTERNAL_HOST_BINS): \ ++ cmd = $$[QT_HOST_BINS]/$$2 ++ else: \ ++ cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 + exists($${cmd}.pl) { + cmd = perl -w $$system_path($${cmd}.pl) + } else: contains(QMAKE_HOST.os, Windows) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 839c3d6..45934a0 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -14,10 +14,11 @@ load(qt_app) + CONFIG += console + DEFINES *= QT_USE_QSTRINGBUILDER + ++QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] ++ + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-# Non-bootstrapped tools always need this because of the environment setup. +-!build_pass:if(!host_build|!force_bootstrap|force_independent) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty(QT_EXTERNAL_HOST_BINS) { + isEmpty(MODULE):MODULE = $$TARGET + + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) +diff --git a/qtbase.pro b/qtbase.pro +index 98ca86a..0eed475 100644 +--- a/qtbase.pro ++++ b/qtbase.pro +@@ -37,12 +37,16 @@ CONFIG -= qt + + ### installations #### + ++QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] ++ + #qmake + qmake.path = $$[QT_HOST_BINS] ++qmake.files = $$OUT_PWD/bin/qmake ++!isEmpty(QT_EXTERNAL_HOST_BINS) { ++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake ++} + equals(QMAKE_HOST.os, Windows) { +- qmake.files = $$OUT_PWD/bin/qmake.exe +-} else { +- qmake.files = $$OUT_PWD/bin/qmake ++ qmake.files = $${qmake.files}.exe + } + INSTALLS += qmake + +@@ -59,6 +63,9 @@ INSTALLS += fixqt4headers + #syncqt + syncqt.path = $$[QT_HOST_BINS] + syncqt.files = $$PWD/bin/syncqt.pl ++!isEmpty(QT_EXTERNAL_HOST_BINS) { ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl ++} + INSTALLS += syncqt + + # If we are doing a prefix build, create a "module" pri which enables +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 91a4eb6..25df27c 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d94715..301af8f 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_DBus_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_DBus_check_file_exists(${imported_location}) + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2..5621dc0 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Widgets_check_file_exists(${imported_location}) + +-- +2.7.1 + diff --git a/recipes/qt5/qtbase-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes/qt5/qmake5-5.6.0/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch similarity index 67% rename from recipes/qt5/qtbase-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch rename to recipes/qt5/qmake5-5.6.0/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 182de79..4807df0 100644 --- a/recipes/qt5/qtbase-5.3.1/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes/qt5/qmake5-5.6.0/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,7 +1,7 @@ -From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001 +From db746d1ca0c41fe3da103d09fc240a0df9db5404 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,54 +61,49 @@ Content-Transfer-Encoding: 8bit Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller +Signed-off-by: Jonathan Liu --- + mkspecs/features/qt.prf | 13 +++++++++++++ mkspecs/features/qt_common.prf | 2 +- - mkspecs/features/qt_module.prf | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) + 2 files changed, 14 insertions(+), 1 deletion(-) +diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf +index f62b6bb..91be8b3 100644 +--- a/mkspecs/features/qt.prf ++++ b/mkspecs/features/qt.prf +@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { + QTPLUGIN = $$manualplugs $$autoplugs + } + ++contains(TEMPLATE, .*lib) { ++ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]" ++ pkgconfig_prefix_replace.replace = "prefix=" ++ pkgconfig_prefix_replace.CONFIG = path ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace ++ ++ # drop -L/usr/lib in .prl files ++ prl_replace.match = "-L\$${libdir}" ++ prl_replace.replace = "" ++ prl_replace.CONFIG = path ++ QMAKE_PRL_INSTALL_REPLACE += prl_replace ++} ++ + QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN + contains(QT_CONFIG, static) { + QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4dcabe9..d04bc3e 100644 +index 38602f6..f9c401f 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf -@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { +@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { lib_replace.replace = } else { lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qt_libdir +- lib_replace.replace = $$qqt_libdir + lib_replace.replace = "\$$\\{libdir}" } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 8bf4c92..ee2e989 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -188,10 +188,25 @@ unix|mingw { - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module - QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace - -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_include_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace -+ - unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$qt_libdir - QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace -+ # add '=' as sysroot in .la files -+ lafile_replace.match = "-L\$${libdir}" -+ lafile_replace.replace = "-L=\$$\\{libdir}" -+ lafile_replace.CONFIG = path -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace -+ # drop -L/usr/lib in .prl files -+ prl_replace.match = "-L\$${libdir}" -+ prl_replace.replace = "" -+ prl_replace.CONFIG = path -+ QMAKE_PRL_INSTALL_REPLACE += prl_replace - } - } - -- -2.0.0 +2.7.1 diff --git a/recipes/qt5/qtbase-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch b/recipes/qt5/qmake5-5.6.0/0006-QOpenGLPaintDevice-sub-area-support.patch similarity index 78% rename from recipes/qt5/qtbase-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch rename to recipes/qt5/qmake5-5.6.0/0006-QOpenGLPaintDevice-sub-area-support.patch index 27496db..57a0dd1 100644 --- a/recipes/qt5/qtbase-5.3.1/0011-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes/qt5/qmake5-5.6.0/0006-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001 +From f6d59b0835e32f0575ec1671dff0348af1886da6 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support +Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -12,26 +12,19 @@ Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 Signed-off-by: Martin Jansa --- - src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ + src/gui/opengl/qopenglpaintdevice.cpp | 11 +++++++++++ src/gui/opengl/qopenglpaintdevice.h | 2 ++ + src/gui/opengl/qopenglpaintdevice_p.h | 1 + src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- src/gui/opengl/qopenglpaintengine_p.h | 1 + src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- - 5 files changed, 23 insertions(+), 3 deletions(-) + 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index 6750458..034630a 100644 +index 17a3277..85425da 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp -@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate - public: - QOpenGLPaintDevicePrivate(const QSize &size); - -+ QPoint offset; - QSize size; - QOpenGLContext *ctx; - -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) +@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) { } @@ -42,9 +35,9 @@ index 6750458..034630a 100644 +} + /*! - Destroys the QOpenGLPaintDevice. - */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const + \internal + */ +@@ -216,6 +222,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const return d_ptr->ctx; } @@ -57,10 +50,10 @@ index 6750458..034630a 100644 Returns the pixel size of the paint device. diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index c05571c..01eb1bc 100644 +index 804e485..88b481a 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h -@@ -62,12 +62,14 @@ public: +@@ -53,12 +53,14 @@ public: QOpenGLPaintDevice(); explicit QOpenGLPaintDevice(const QSize &size); QOpenGLPaintDevice(int width, int height); @@ -75,11 +68,23 @@ index c05571c..01eb1bc 100644 QSize size() const; void setSize(const QSize &size); void setDevicePixelRatio(qreal devicePixelRatio); +diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h +index 54ea092..f660143 100644 +--- a/src/gui/opengl/qopenglpaintdevice_p.h ++++ b/src/gui/opengl/qopenglpaintdevice_p.h +@@ -65,6 +65,7 @@ public: + + public: + QSize size; ++ QPoint offset; + QOpenGLContext *ctx; + + qreal dpmx; diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 81a0d82..ce57261 100644 +index 0b92bf4..f41e059 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2078,7 +2078,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -90,16 +95,16 @@ index 81a0d82..ce57261 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2165,7 +2168,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); - d->funcs.glViewport(0, 0, d->width, d->height); + d->funcs.glViewport(d->x, d->y, d->width, d->height); d->needsSync = false; - d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() + d->syncGlState(); +@@ -2207,6 +2210,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { funcs.glDisable(GL_SCISSOR_TEST); } else { @@ -107,7 +112,7 @@ index 81a0d82..ce57261 100644 funcs.glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2215,12 +2219,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -123,7 +128,7 @@ index 81a0d82..ce57261 100644 funcs.glScissor(left, bottom, width, height); diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index 4f0e2e5..f211de1 100644 +index f1ec669..6d302b8 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -264,6 +264,7 @@ public: @@ -135,10 +140,10 @@ index 4f0e2e5..f211de1 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 0610ab6..ea1e3b2 100644 +index c179143..fad68d5 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) +@@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { @@ -148,5 +153,5 @@ index 0610ab6..ea1e3b2 100644 } else { if (m_vao.isCreated()) { -- -2.0.2 +2.7.1 diff --git a/recipes/qt5/qmake5-5.6.0/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes/qt5/qmake5-5.6.0/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch new file mode 100644 index 0000000..62e8a0d --- /dev/null +++ b/recipes/qt5/qmake5-5.6.0/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch @@ -0,0 +1,36 @@ +From 0cac609e192c303e26d139b4a7d5b35897a020a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 8 Jun 2015 13:59:25 -0700 +Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining + QT_SOCKLEN_T + +This helps to make sure that QT_SOCKLEN_T is defined to be 'int' +only when its glibc < 2 and not also for the libraries which may define +it as per standards but are not glibc, e.g. musl + +Signed-off-by: Khem Raj +--- + mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h +index dd12003..8623651 100644 +--- a/mkspecs/linux-oe-g++/qplatformdefs.h ++++ b/mkspecs/linux-oe-g++/qplatformdefs.h +@@ -86,10 +86,10 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) +-#define QT_SOCKLEN_T socklen_t +-#else ++#if defined(__GLIBC__) && (__GLIBC__ < 2) + #define QT_SOCKLEN_T int ++#else ++#define QT_SOCKLEN_T socklen_t + #endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +-- +2.7.1 + diff --git a/recipes/qt5/qmake5-5.3.1/0011-Always-build-uic.patch b/recipes/qt5/qmake5-5.6.0/0009-Always-build-uic.patch similarity index 66% rename from recipes/qt5/qmake5-5.3.1/0011-Always-build-uic.patch rename to recipes/qt5/qmake5-5.6.0/0009-Always-build-uic.patch index a1af18e..e2b57ce 100644 --- a/recipes/qt5/qmake5-5.3.1/0011-Always-build-uic.patch +++ b/recipes/qt5/qmake5-5.6.0/0009-Always-build-uic.patch @@ -1,7 +1,7 @@ -From 271db04ebfbaf67e2e8c30ff050510c5a42acfa4 Mon Sep 17 00:00:00 2001 +From 376eba77c429a503b05256786f2996b397c2e36f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 11/12] Always build uic +Subject: [PATCH 09/10] Always build uic Even if we are not building gui or widgets. This tool is needed later as a native tool when compiling the target. @@ -14,18 +14,18 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 6a805a6..90623a6 100644 +index 1671338..83de483 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent } } } --SUBDIRS += src_plugins src_tools_qdoc -+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic nacl: SUBDIRS -= src_network src_testlib -- -2.0.0 +2.7.1 diff --git a/recipes/qt5/qmake5-5.6.0/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes/qt5/qmake5-5.6.0/0010-Add-external-hostbindir-option-for-native-sdk.patch new file mode 100644 index 0000000..9fa0a33 --- /dev/null +++ b/recipes/qt5/qmake5-5.6.0/0010-Add-external-hostbindir-option-for-native-sdk.patch @@ -0,0 +1,134 @@ +From 2b55cf1075167ce6b7e4cff1ea89dc2c27265f23 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 10/10] Add -external-hostbindir option for native(sdk) + +* when cross-compiling it's sometimes useful to use existing tools from machine + (or in OpenEmbedded built with separate native recipe) when building for target + +* this way we can skip bootstraping tools we already have + +* qt_functions: temporary remove isEmpty check +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value +* isEmpty works correctly only with qmake variables (e.g. $$FOO - + isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. + +* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries + +Upstream-Status: Pending + is a lot better for upstreaming (and it was already sort of approved by + Oswald) but in 5.2.0 I've noticed that he added something similar for + android builds + +Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37 +Signed-off-by: Martin Jansa +Signed-off-by: Simon Busch +Signed-off-by: Jonathan Liu +Signed-off-by: Martin Jansa + +Conflicts: + tools/configure/configureapp.cpp +--- + configure | 1 + + qmake/property.cpp | 1 + + src/corelib/global/qlibraryinfo.cpp | 3 ++- + src/corelib/global/qlibraryinfo.h | 1 + + tools/configure/configureapp.cpp | 11 +++++++++++ + 5 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index c696e7e..310eb1d 100755 +--- a/configure ++++ b/configure +@@ -3922,6 +3922,7 @@ fi + addConfStr "$QT_REL_HOST_BINS" + addConfStr "$QT_REL_HOST_LIBS" + addConfStr "$QT_REL_HOST_DATA" ++addConfStr "$QT_EXTERNAL_HOST_BINS" + addConfStr "$shortxspec" + addConfStr "$shortspec" + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index 817ae95..c69539f 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -68,6 +68,7 @@ static const struct { + { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, + { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, + { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, + { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, + { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, + }; +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index e1c87b5..d6e03ba 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() + */ + + static const struct { +- char key[19], value[13]; ++ char key[21], value[13]; + } qtConfEntries[] = { + { "Prefix", "." }, + { "Documentation", "doc" }, // should be ${Data}/doc +@@ -398,6 +398,7 @@ static const struct { + { "HostBinaries", "bin" }, + { "HostLibraries", "lib" }, + { "HostData", "." }, ++ { "ExternalHostBinaries", "" }, + { "TargetSpec", "" }, + { "HostSpec", "" }, + { "HostPrefix", "" }, +diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h +index 1ad7637..5a8b127 100644 +--- a/src/corelib/global/qlibraryinfo.h ++++ b/src/corelib/global/qlibraryinfo.h +@@ -81,6 +81,7 @@ public: + HostBinariesPath, + HostLibrariesPath, + HostDataPath, ++ ExternalHostBinariesPath, + TargetSpecPath, + HostSpecPath, + HostPrefixPath, +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index 555ccbf..d9a5b08 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -1248,6 +1248,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); + } + ++ else if (configCmdLine.at(i) == "-external-hostbindir") { ++ ++i; ++ if (i == argCount) ++ break; ++ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i); ++ } ++ + else if (configCmdLine.at(i) == "-make-tool") { + ++i; + if (i == argCount) +@@ -4214,6 +4221,9 @@ void Configure::generateQConfigCpp() + + if (dictionary["QT_REL_HOST_DATA"].isEmpty()) + dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; ++ ++ if (dictionary["QT_EXTERNAL_HOST_BINS"].isEmpty()) ++ dictionary["QT_EXTERNAL_HOST_BINS"] = haveHpx ? "bin" : dictionary["QT_REL_INSTALL_BINS"]; + + confStringOff = 0; + addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); +@@ -4233,6 +4243,7 @@ void Configure::generateQConfigCpp() + addConfStr(1, dictionary["QT_REL_HOST_BINS"]); + addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); + addConfStr(1, dictionary["QT_REL_HOST_DATA"]); ++ addConfStr(1, dictionary["QT_EXTERNAL_HOST_BINS"]); + addConfStr(1, targSpec); + addConfStr(1, hostSpec); + +-- +2.7.1 + diff --git a/recipes/qt5/qmake5-5.6.0/force-sysroot.patch b/recipes/qt5/qmake5-5.6.0/force-sysroot.patch new file mode 100644 index 0000000..9a0738c --- /dev/null +++ b/recipes/qt5/qmake5-5.6.0/force-sysroot.patch @@ -0,0 +1,45 @@ +From: Morten Thunberg Svendsen +Date: Mon, 04 Apr 2016 00:00:00 +0100 +Subject: Add option to force qmake to accepts sysroot from qt.conf + +* qmake will only prepend the sysroot given in qt.conf if compiled with the + sysroot parameter and PATH, resulting in qmake containing the hardcoded STAGE + dir given durring compile. Avoid this in OE-lite. Added the "-confsysroot" + configure flag that will enable the sysroot code logic, without hardcoding + any STAGE dirs. + +--- +Index: qtbase-opensource-src-5.6.0/configure +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/configure ++++ qtbase-opensource-src-5.6.0/configure +@@ -934,6 +934,7 @@ while [ "$#" -gt 0 ]; do + -hostlibdir| \ + -extprefix| \ + -sysroot| \ ++ -confsysroot| \ + -depths| \ + -make| \ + -nomake| \ +@@ -1261,6 +1262,9 @@ while [ "$#" -gt 0 ]; do + sysroot) + CFG_SYSROOT="$VAL" + ;; ++ confsysroot) ++ CFG_CONF_SYSROOT="true" ++ ;; + gcc-sysroot) + CFG_GCC_SYSROOT="$VAL" + ;; +@@ -3731,6 +3735,11 @@ else + HAVE_HOST_PATH=true + fi + ++if [ -n "$CFG_CONF_SYSROOT" ]; then ++ QMAKE_SYSROOTIFY=true ++fi ++ ++ + #------- make the paths relative to the prefixes -------- + + PREFIX_COMPLAINTS= diff --git a/recipes/qt5/qmake5.inc b/recipes/qt5/qmake5.inc index 0cfa26d..b1c8e22 100644 --- a/recipes/qt5/qmake5.inc +++ b/recipes/qt5/qmake5.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" -LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" DEPENDS = "zlib" EXTRA_DEPENDS_SDK = "libdl librt" @@ -14,15 +14,21 @@ inherit c++ make pkgconfig require qmake5-${PV}.inc -#TBD: Bugs are seen with more more than 1 parallel maker -PARALLEL_MAKE = "" +# Ensure that changes to configure task or rdepends on that triggers new +# do_unpack. Solves compile error on rebuild caused by do_configure change. +do_unpack[emit] += "do_stage" QT_CONF_PATH = "${B}/qt.conf" EXTRA_OECONF = " \ - -prefix '${prefix}/' \ - -dont-process \ + -prefix /${prefix} \ + -hostprefix /${prefix} \ + -hostdatadir ${OE_QMAKE_PATH_ARCHDATA} \ + -hostlibdir ${OE_QMAKE_PATH_LIBS} \ + -hostbindir ${OE_QMAKE_PATH_BINS} \ -no-gcc-sysroot \ + -confirm-license \ + -opensource \ -system-zlib \ -no-libjpeg \ -no-libpng \ @@ -37,6 +43,7 @@ EXTRA_OECONF = " \ -no-opengl \ -no-openssl \ -no-xcb \ + -no-icu \ -verbose \ -release \ -bindir ${OE_QMAKE_PATH_BINS} \ @@ -51,9 +58,19 @@ EXTRA_OECONF = " \ -silent \ -nomake examples \ -nomake tests \ + -nomake libs \ + -make tools \ -no-rpath \ -platform ${BUILD_PLATFORM} \ " + +EXTRA_OECONF:>sdk += " -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ + -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ + -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ +" + +EXTRA_OECONF:>native += " -confsysroot" + BUILD_PLATFORM = "linux-oe-g++" BUILD_PLATFORM:HOST_LIBC_mingw = "win32-g++" EXTRA_OECONF:>HOST_LIBC_mingw += " \ @@ -61,10 +78,6 @@ EXTRA_OECONF:>HOST_LIBC_mingw += " \ -device-option CROSS_COMPILE=${HOST_PREFIX} \ -qpa windows" -RECIPE_FLAGS += "qtdbus" -EXTRA_OECONF:>USE_qtdbus = "-dbus" -DEPENDS:>USE_qtdbus = " libdbus" - # qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell export OE_QMAKE_COMPILER export OE_QMAKE_CC @@ -109,13 +122,31 @@ USE_MINGW_SPEC:HOST_LIBC_mingw = "-spec ${S}/mkspecs/win32-g++" do_configure[prefuncs] += "do_configure_preqt" do_configure_preqt() { - (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + [ -e Makefile ] && oe_runmake -k clean || : + (echo o; echo yes) | bash -x ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + bin/qmake -query bin/qmake ${USE_MINGW_SPEC} ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { - oe_runmake install INSTALL_ROOT=${D} + # Fix install paths for all + find . -name "Makefile*" | xargs sed -i.oebak \ + -e 's,(INSTALL_ROOT)${BUILD_SYSROOT}${BUILD_SYSROOT},(INSTALL_ROOT),g' \ + -e 's,(INSTALL_ROOT)${BUILD_SYSROOT},(INSTALL_ROOT),g' \ + -e 's,(INSTALL_ROOT)${D},(INSTALL_ROOT),g' + oe_runmake install INSTALL_ROOT=${D} + if [ -d ${D}${BUILD_SYSROOT} ] ; then + echo "Some files are installed in wrong directory ${D}${HOST_SYSROOT}" + cp -ra ${D}${BUILD_SYSROOT}/* ${D} + rm -rf ${D}${BUILD_SYSROOT} + # remove empty dirs + TMP=`dirname ${D}/${BUILD_SYSROOT}` + while test $TMP != ${D}${BUILD_SYSROOT}; do + rmdir $TMP || return 0 + TMP=`dirname $TMP`; + done + fi } INSTALL_QT_UTILS = "" @@ -130,12 +161,11 @@ do_install_qt_utils_fixup () { mv ${D}${bindir}/realrcc${QTTOOLS_SUFFIX} ${D}${bindir}/rcc${QTTOOLS_SUFFIX} } -FILES_${PN} += " ${libdir}" +FILES_${PN} += "${libdir}" PACKAGES =+ "${PN}-libs" DEPENDS_${PN} += "${PN}-libs_${PV}" RDEPENDS_${PN} += "${PN}-libs_${PV}" -# Make libs hold shared objects only - to be used in the SDK FILES_${PN}-libs = "${libdir}/*.so*" PACKAGES =+ "${PN}-cmake" @@ -144,12 +174,12 @@ FILES_${PN}-cmake = "${libdir}/cmake" PACKAGES =+ "${PN}-plugins" DEPENDS_${PN} += "${PN}-plugins_${PV}" RDEPENDS_${PN} += "${PN}-plugins_${PV}" -FILES_${PN}-plugins = "${libdir}/qt5/plugins" +FILES_${PN}-plugins = "${libdir}/plugins" PACKAGES =+ "${PN}-mkspecs" DEPENDS_${PN} += "${PN}-mkspecs_${PV}" RDEPENDS_${PN} += "${PN}-mkspecs_${PV}" -FILES_${PN}-mkspecs = "${libdir}/qt5/mkspecs" +FILES_${PN}-mkspecs = "${libdir}/mkspecs" PACKAGES =+ " ${PN}-utilities " FILES_${PN}-utilities = "${bindir}" diff --git a/recipes/qt5/qmake5_5.3.1.oe b/recipes/qt5/qmake5_5.3.1.oe deleted file mode 100644 index f985624..0000000 --- a/recipes/qt5/qmake5_5.3.1.oe +++ /dev/null @@ -1,27 +0,0 @@ -## Recipe for building qmake for qt5. -## -## May be used to build both a native and a sdk version of qmake. - -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += "\ - file://0001-Add-linux-oe-g-platform.patch \ - file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ - file://0011-QOpenGLPaintDevice-sub-area-support.patch \ - file://0011-Always-build-uic.patch \ -" - -SRC_URI:>HOST_LIBC_mingw = "\ - file://mingw-spec.patch\ - file://mingw-manually-enable-msys.patch \ - file://mingw-disable-vars-from-shell.patch \ -" - diff --git a/recipes/qt5/qmake5_5.3.1.oe.sig b/recipes/qt5/qmake5_5.3.1.oe.sig deleted file mode 100644 index 6181b7d..0000000 --- a/recipes/qt5/qmake5_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4496edb8377e303f09145a1215f79e62e3a7ba11 qtbase-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qmake5_5.6.0.oe b/recipes/qt5/qmake5_5.6.0.oe new file mode 100644 index 0000000..7ac141f --- /dev/null +++ b/recipes/qt5/qmake5_5.6.0.oe @@ -0,0 +1,25 @@ +## Recipe for building qmake for qt5. +## +## May be used to build both a native and a sdk version of qmake. + +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI += "\ +file://0001-Add-linux-oe-g-platform.patch \ +file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ +file://0003-Add-external-hostbindir-option.patch \ +file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ +file://0006-QOpenGLPaintDevice-sub-area-support.patch \ +file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ +file://0009-Always-build-uic.patch \ +file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ +" + +SRC_URI:>native += " file://force-sysroot.patch" + +SRC_URI:>HOST_LIBC_mingw = "\ + file://mingw-spec.patch\ + file://mingw-manually-enable-msys.patch \ + file://mingw-disable-vars-from-shell.patch \ +" diff --git a/recipes/qt5/qmake5_5.6.0.oe.sig b/recipes/qt5/qmake5_5.6.0.oe.sig new file mode 100644 index 0000000..3ef06b1 --- /dev/null +++ b/recipes/qt5/qmake5_5.6.0.oe.sig @@ -0,0 +1,2 @@ +b82d8248b8847870eafe7764e2af99e8f9bb6eba qtbase-opensource-src-5.6.0-rc.tar.xz +7536cb165f773efd2202dbb44d7ad0fe1ce66ce3 qtbase-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qt5-5.1.1.inc b/recipes/qt5/qt5-5.1.1.inc deleted file mode 100644 index 4d26107..0000000 --- a/recipes/qt5/qt5-5.1.1.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" - -QT_VERSION ?= "${PV}" - -SRC_URI += " \ - http://download.qt-project.org/official_releases/qt/5.1/${PV}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz" -S = "${SRCDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" diff --git a/recipes/qt5/qt5-5.3.1.inc b/recipes/qt5/qt5-5.3.1.inc deleted file mode 100644 index 1be09e9..0000000 --- a/recipes/qt5/qt5-5.3.1.inc +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" - -QT_VERSION ?= "${PV}" - -SRC_URI += " \ - http://download.qt-project.org/official_releases/qt/5.3/${PV}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz" -S = "${SRCDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" diff --git a/recipes/qt5/qt5-5.6.0.inc b/recipes/qt5/qt5-5.6.0.inc new file mode 100644 index 0000000..06a0438 --- /dev/null +++ b/recipes/qt5/qt5-5.6.0.inc @@ -0,0 +1,8 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2013 Martin Jansa + +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" + +SRC_URI += " \ + http://download.qt.io/official_releases/qt/5.6/${PV}/submodules/${QT_MODULE}-opensource-src-${PV}.tar.xz" +S = "${SRCDIR}/${QT_MODULE}-opensource-src-${PV}" diff --git a/recipes/qt5/qt5.inc b/recipes/qt5/qt5.inc index 91aa2f1..86d6987 100644 --- a/recipes/qt5/qt5.inc +++ b/recipes/qt5/qt5.inc @@ -7,22 +7,15 @@ inherit qmake5 QT_MODULE ?= "${PN}" -# we don't want conflicts with qt4 -OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" -OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}" -OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}" -OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}" -OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}" -OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}" -OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" -OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" -OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" - #Examples are present in all Qt modules RECIPE_FLAGS += "qtexamples" DEFAULT_USE_qtexamples = "1" PACKAGES:USE_qtdbus = "-dbus" +DEPENDS:>USE_qtdbus = " libdbus" + PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev " RDEPENDS_${PN} += "${PN}-plugins_${PV} ${PN}-qmlplugins_${PV}" @@ -31,9 +24,11 @@ FILES_${PN}-qmlplugins-dbg = " \ ${OE_QMAKE_PATH_QML}/*/.debug \ ${OE_QMAKE_PATH_QML}/*/*/.debug \ ${OE_QMAKE_PATH_QML}/*/*/*/.debug \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ ${OE_QMAKE_PATH_IMPORTS}/*/.debug \ ${OE_QMAKE_PATH_IMPORTS}/*/*/.debug \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/.debug \ + ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*/.debug \ " FILES_${PN}-tools-dbg = " \ ${OE_QMAKE_PATH_BINS}/.debug \ @@ -45,6 +40,7 @@ FILES_${PN}-plugins-dbg = " \ # extra packages # qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} FILES_${PN}-qmlplugins = " \ + ${OE_QMAKE_PATH_QML}/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ @@ -60,6 +56,11 @@ FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ + ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \ @@ -70,6 +71,9 @@ FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/qmldir \ + ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*/*.qmltypes \ + ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*/images/ \ " FILES_${PN}-tools = " \ diff --git a/recipes/qt5/qtbase-5.3.1/0001-Add-linux-oe-g-platform.patch b/recipes/qt5/qtbase-5.3.1/0001-Add-linux-oe-g-platform.patch deleted file mode 100644 index eca6b36..0000000 --- a/recipes/qt5/qtbase-5.3.1/0001-Add-linux-oe-g-platform.patch +++ /dev/null @@ -1,350 +0,0 @@ -From 9c7d71880c6ec5b07e3030b7c7a23e004d5c60a2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/12] Add linux-oe-g++ platform - -* This qmake.conf unlike other platforms reads most variables from - shell environment, because it's easier for qt recipes to export - *FLAGS or CC specific for given recipe - -* configure: add getQEvalMakeConf and getXQEvalMakeConf - Allow expansion of $(...) references from qmake.conf to generate - qmake environment from shell environment as exported by qmake5_base - -* configure: don't export SYSTEM_VARIABLES to .qmake.vars - linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is - causing issues as we need g++ to be used as linker - -* configure.prf: Allow to add extra arguments to make - sometimes we would like to add -e or define some variable and respect it from both - Makefiles used in configure tests and also Makefiles to build the application - -* OE_QMAKE_CXX in order to allow compiler version check to succeed - which allows WebKit to be enabled. - -* Other variables in order to let config.tests to use our -platform - settings - -* Add setBootstrapEvalVariable to bootstrap qmake with our environment - too, this allows us to use -platform linux-oe-g++ also for native - recipe - -* disable gdb_dwarf_index - * qmake is trying to call native gdb and we don't depend on gdb-native - (or even provide gdb-native) - * fixes errors like this: - /bin/sh: gdb: command not found - /bin/sh: line 0: test: -gt: unary operator expected - which are not fatal, but still misleading in do_configure output - -Upstream-Status: Inappropriate [embedded specific] - too OE specific, probably cannot be upstreamed - -Signed-off-by: Martin Jansa ---- - configure | 66 ++++++++++++++++------- - mkspecs/features/configure.prf | 4 +- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ - mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 4 files changed, 188 insertions(+), 22 deletions(-) - create mode 100644 mkspecs/linux-oe-g++/qmake.conf - create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h - -diff --git a/configure b/configure -index d5c2b08..4eae0d3 100755 ---- a/configure -+++ b/configure -@@ -324,6 +324,16 @@ getQMakeConf() - getSingleQMakeVariable "$1" "$specvals" - } - -+# OE qmake.conf is reading some variables from shell env -+# read them from qmake.conf, replace qmake () syntax with shell and eval -+getQEvalMakeConf() -+{ -+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` -+ EVAL=`eval "echo ${VAL}"` -+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2 -+ eval "echo ${VAL}" -+} -+ - getXQMakeConf() - { - if [ -z "$xspecvals" ]; then -@@ -333,6 +343,16 @@ getXQMakeConf() - getSingleQMakeVariable "$1" "$xspecvals" - } - -+# OE qmake.conf is reading some variables from shell env -+# read them from qmake.conf, replace qmake () syntax with shell and eval -+getXQEvalMakeConf() -+{ -+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` -+ EVAL=`eval "echo ${VAL}"` -+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2 -+ eval "echo ${VAL}" -+} -+ - compilerSupportsFlag() - { - cat >conftest.cpp <&2 - fi'` - eval "$cmd" - done -+ -+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" -@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then - [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no - fi - --QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` - - TEST_COMPILER=$QMAKE_CONF_COMPILER - -@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then - exit 1 - fi - fi --TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS` -+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS` - - GCC_MACHINE_DUMP= - case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3633,6 +3651,14 @@ setBootstrapVariable() - getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" - } - -+# OE qmake.conf is reading some variables from shell env -+# read them from qmake.conf, replace qmake () syntax with shell and eval -+setBootstrapEvalVariable() -+{ -+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" -+} -+ -+ - # build qmake - if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." -@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - fi - - [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= -- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" -- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" -- setBootstrapVariable QMAKE_CFLAGS -- setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS -- setBootstrapVariable QMAKE_CXXFLAGS -- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -- setBootstrapVariable QMAKE_LFLAGS -- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS -+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CFLAGS -+ setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -+ setBootstrapEvalVariable QMAKE_LFLAGS -+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS - - if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index fe41c54..e2db923 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -60,12 +60,12 @@ defineTest(qtCompileTest) { - } - - # Clean up after previous run -- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") -+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") - - mkpath($$test_out_dir)|error("Aborting.") - - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { -- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { -+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { - log("yes$$escape_expand(\\n)") - msg = "test $$1 succeeded" - write_file($$QMAKE_CONFIG_LOG, msg, append) -diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf -new file mode 100644 -index 0000000..ca26b10 ---- /dev/null -+++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,40 @@ -+# -+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded -+# -+ -+MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental -+QMAKE_INCREMENTAL_STYLE = sublib -+ -+include(../common/linux.conf) -+ -+# QMAKE_ (moc, uic, rcc) are gone, overwrite only ar and strip -+QMAKE_AR = $(OE_QMAKE_AR) cqs -+QMAKE_STRIP = $(OE_QMAKE_STRIP) -+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER) -+ -+include(../common/gcc-base-unix.conf) -+ -+# *FLAGS from gcc-base.conf -+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) -+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) -+ -+include(../common/g++-unix.conf) -+ -+# tc settings from g++-base.conf -+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CXX = $(OE_QMAKE_CXX) -+ -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) -+ -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LINK_C = $(OE_QMAKE_LINK) -+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) -+ -+# for the SDK -+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) -+ -+load(qt_config) -diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -new file mode 100644 -index 0000000..dd12003 ---- /dev/null -+++ b/mkspecs/linux-oe-g++/qplatformdefs.h -@@ -0,0 +1,100 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#ifndef QPLATFORMDEFS_H -+#define QPLATFORMDEFS_H -+ -+// Get Qt defines/settings -+ -+#include "qglobal.h" -+ -+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs -+ -+// 1) need to reset default environment if _BSD_SOURCE is defined -+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -+// 3) it seems older glibc need this to include the X/Open stuff -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE -+#endif -+ -+#include -+ -+ -+// We are hot - unistd.h should have turned on the specific APIs we requested -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifndef QT_NO_IPV6IFNAME -+#include -+#endif -+ -+#define QT_USE_XOPEN_LFS_EXTENSIONS -+#include "../common/posix/qplatformdefs.h" -+ -+#undef QT_SOCKLEN_T -+ -+#if defined(__GLIBC__) && (__GLIBC__ >= 2) -+#define QT_SOCKLEN_T socklen_t -+#else -+#define QT_SOCKLEN_T int -+#endif -+ -+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -+#define QT_SNPRINTF ::snprintf -+#define QT_VSNPRINTF ::vsnprintf -+#endif -+ -+#endif // QPLATFORMDEFS_H --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes/qt5/qtbase-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index 29f788e..0000000 --- a/recipes/qt5/qtbase-5.3.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ad884ab378939e685a3b00af03bb6875d9bdc1d5 Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/12] 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: Inappropriate [embedded specific] - again very OE specific to read everything from environment (reusing the same - qmake from sstate and replacing all configured paths in it with qt.conf from - environment). - -Signed-off-by: Martin Jansa ---- - src/corelib/global/qlibraryinfo.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6d25325..80e0f30 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() - - QSettings *QLibraryInfoPrivate::findConfiguration() - { -- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); -+ QByteArray config = getenv("QT_CONF_PATH"); -+ QString qtconfig = QFile::decodeName(config); -+ if(!QFile::exists(qtconfig)) -+ qtconfig = QStringLiteral(":/qt/etc/qt.conf"); - #ifdef QT_BOOTSTRAPPED - if(!QFile::exists(qtconfig)) - qtconfig = qt_libraryInfoFile(); --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes/qt5/qtbase-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 78fb3c6..0000000 --- a/recipes/qt5/qtbase-5.3.1/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8a14a69d5b0078554ed002e682c72e995b1e6320 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending - again a bit OE specific ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 7e61845..29c6358 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() - configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - configStream << "}" << endl; - configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes/qt5/qtbase-5.3.1/0005-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index b2121cf..0000000 --- a/recipes/qt5/qtbase-5.3.1/0005-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/16] qmake is already built in qtbase-native - -Ported from OE by: Yu Ke -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 1ca5b4e..546bed2 100755 ---- a/configure -+++ b/configure -@@ -3667,7 +3667,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit --- -1.8.2.1 - diff --git a/recipes/qt5/qtbase-5.3.1/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes/qt5/qtbase-5.3.1/0006-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index 9733314..0000000 --- a/recipes/qt5/qtbase-5.3.1/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/16] Allow building a separate qmake for the target - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ - PROEVALUATOR_FULL PROEVALUATOR_DEBUG - DESTDIR = ../bin/ -+TARGET = qmake - - OBJECTS_DIR = . - MOC_DIR = . --- -1.8.2.1 - diff --git a/recipes/qt5/qtbase-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes/qt5/qtbase-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch deleted file mode 100644 index 0e3bc99..0000000 --- a/recipes/qt5/qtbase-5.3.1/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ca212fd10a95b2c694f3c89c3f22a2b0ae185198 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 21 Apr 2014 19:22:04 +0200 -Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode" - -This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. ---- - src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- - src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp -index 5eed470..39c7c1f 100644 ---- a/src/platformsupport/eglconvenience/qeglconvenience.cpp -+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp -@@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) - for (index = 0; attrs[index].attr != -1; ++index) { - EGLint value; - if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { -- qDebug("\t%s: %d", attrs[index].name, (int)value); -+ qWarning("\t%s: %d\n", attrs[index].name, (int)value); - } - } -+ -+ qWarning("\n"); - } - - #ifdef Q_OS_LINUX -diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -index eec6463..4a7c69b 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -@@ -44,7 +44,6 @@ - #include "qeglpbuffer_p.h" - #include - #include --#include - - QT_BEGIN_NAMESPACE - -@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont - return; - } - -- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt(); -- if (printConfig) { -- qDebug() << "Created context for format" << format << "with config:"; -- q_printEglConfig(m_eglDisplay, m_eglConfig); -- } -- - #ifndef QT_NO_OPENGL - // Make the context current to ensure the GL version query works. This needs a surface too. - const EGLint pbufferAttributes[] = { --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes/qt5/qtbase-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch deleted file mode 100644 index 1f029a2..0000000 --- a/recipes/qt5/qtbase-5.3.1/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d61189d1706d3367eada4e7db6f2c6c167130ce Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h - -Signed-off-by: Martin Jansa ---- - src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -index f665455..9eb783c 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -+++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -@@ -46,6 +46,12 @@ - #include - #include - -+// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ -+// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */ -+#ifdef CursorShape -+#undef CursorShape -+#endif -+ - QT_BEGIN_NAMESPACE - - class QEGLPlatformScreen; --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch b/recipes/qt5/qtbase-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch deleted file mode 100644 index b1c4690..0000000 --- a/recipes/qt5/qtbase-5.3.1/0008-configure-bump-path-length-from-256-to-512-character.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 107fe67947ced65315550e6a7795be24efaab371 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters - -Increase the path length that gets hardcoded into generated config.cpp file -from 256 to 512 characters, as nativesdk path can be quite long. - -Signed-off-by: Denys Dmytriyenko ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 48d5119..3c0347a 100755 ---- a/configure -+++ b/configure -@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ - static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; - - /* Installation Info */ --static const char qt_configure_prefix_path_strs[][256 + 12] = { -+static const char qt_configure_prefix_path_strs[][512 + 12] = { - #ifndef QT_BUILD_QMAKE - "qt_prfxpath=$QT_SYSROOT_PREFIX", - "qt_docspath=$QT_SYSROOT_DOCS", --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes/qt5/qtbase-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch deleted file mode 100644 index cbd0bcd..0000000 --- a/recipes/qt5/qtbase-5.3.1/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one - window/surface -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -running qmlscene -platform eglfs .qml - -caused - -EGL Error : Could not create the egl surface: error = 0x3003 - -Rebased version of [1-2] - -Upstream-Status: unknown - -[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch -[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch - -Signed-off-by: Andreas Müller -Signed-off-by: Martin Jansa ---- - src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp -index 2d36c0b..854531e 100644 ---- a/src/plugins/platforms/eglfs/qeglfswindow.cpp -+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp -@@ -74,6 +74,15 @@ void QEglFSWindow::create() - - m_flags = Created; - -+ static EGLSurface __singleWindowSurface; -+ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) { -+ m_surface = __singleWindowSurface; -+#ifdef QEGL_EXTRA_DEBUG -+ qWarning("Surface recreate request, re-using %x\n", m_surface); -+#endif -+ return; -+ } -+ - if (window()->type() == Qt::Desktop) - return; - -@@ -85,7 +94,7 @@ void QEglFSWindow::create() - if (isRaster() && screen->compositingWindow()) - return; - --#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) -+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) - // We can have either a single OpenGL window or multiple raster windows. - // Other combinations cannot work. - qFatal("EGLFS: OpenGL windows cannot be mixed with others."); -@@ -105,6 +114,11 @@ void QEglFSWindow::create() - - resetSurface(); - -+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows)) -+ { -+ __singleWindowSurface = m_surface; -+ } -+ - screen->setPrimarySurface(m_surface); - - if (isRaster()) { --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes/qt5/qtbase-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch deleted file mode 100644 index da05f28..0000000 --- a/recipes/qt5/qtbase-5.3.1/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8d8db9db8518289f4c1856dd3062c2e324c5c9be Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 4 Jun 2014 15:26:11 +0200 -Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf" - -This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. ---- - mkspecs/features/simd.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf -index 62a63f9..4f86f60 100644 ---- a/mkspecs/features/simd.prf -+++ b/mkspecs/features/simd.prf -@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) - # - # Set up compilers for SIMD (SSE/AVX, NEON etc) - # --gcc { # includes intel_icc and clang variants -+*-g++*|intel_icc|*-clang*|*-qcc* { - sse2 { - HEADERS += $$SSE2_HEADERS - --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes/qt5/qtbase-5.3.1/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch deleted file mode 100644 index 820fb21..0000000 --- a/recipes/qt5/qtbase-5.3.1/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ac507c953112630d7e929be35586e97396b76327 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build - it separately - -* it is already built in qtbase-native, so we don't need it in configure -* allow building a separate qmake for the target - -Upstream-Status: Inappropriate [configuration] - OE specific for native/target builds - -Signed-off-by: Yu Ke -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - qmake/qmake.pro | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 3c0347a..a75ca11 100755 ---- a/configure -+++ b/configure -@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 89d6ea5..7c605b9 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -8,6 +8,8 @@ CONFIG -= qt - DEFINES += \ - QT_BUILD_QMAKE \ - PROEVALUATOR_FULL -+DESTDIR = ../bin/ -+TARGET = qmake - - VPATH += \ - ../src/corelib/global \ --- -2.0.0 - diff --git a/recipes/qt5/qtbase-5.3.1/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes/qt5/qtbase-5.3.1/0018-QOpenGLPaintDevice-sub-area-support.patch deleted file mode 100644 index 9d581f8..0000000 --- a/recipes/qt5/qtbase-5.3.1/0018-QOpenGLPaintDevice-sub-area-support.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH] QOpenGLPaintDevice sub-area support - -Allows creating QOpenGLPaintDevice targetting sub-area -of binded framebuffer. - -Upstream-Status: Pending - -Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 ---- - src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ - src/gui/opengl/qopenglpaintdevice.h | 2 ++ - src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- - src/gui/opengl/qopenglpaintengine_p.h | 1 + - src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- - 5 files changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index f0e7e49..fe9a30c 100644 ---- a/src/gui/opengl/qopenglpaintdevice.cpp -+++ b/src/gui/opengl/qopenglpaintdevice.cpp -@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate - public: - QOpenGLPaintDevicePrivate(const QSize &size); - -+ QPoint offset; - QSize size; - QOpenGLContext *ctx; - -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) - { - } - -+QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height) -+ : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height))) -+{ -+ d_ptr->offset = QPoint(x,y); -+} -+ - /*! - Destroys the QOpenGLPaintDevice. - */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const - return d_ptr->ctx; - } - -+QPoint QOpenGLPaintDevice::offset() const -+{ -+ return d_ptr->offset; -+} -+ - /*! - Returns the pixel size of the paint device. - -diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index c05571c..01eb1bc 100644 ---- a/src/gui/opengl/qopenglpaintdevice.h -+++ b/src/gui/opengl/qopenglpaintdevice.h -@@ -62,12 +62,14 @@ public: - QOpenGLPaintDevice(); - explicit QOpenGLPaintDevice(const QSize &size); - QOpenGLPaintDevice(int width, int height); -+ QOpenGLPaintDevice(int x, int y, int width, int height); - virtual ~QOpenGLPaintDevice(); - - int devType() const { return QInternal::OpenGL; } - QPaintEngine *paintEngine() const; - - QOpenGLContext *context() const; -+ QPoint offset() const; - QSize size() const; - void setSize(const QSize &size); - void setDevicePixelRatio(qreal devicePixelRatio); -diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 0782e42..52afc60 100644 ---- a/src/gui/opengl/qopenglpaintengine.cpp -+++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) - for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) - d->vertexAttributeArraysEnabledState[i] = false; - -+ const QPoint offset = d->device->offset(); - const QSize sz = d->device->size(); -+ d->x = offset.x(); -+ d->y = offset.y(); - d->width = sz.width(); - d->height = sz.height(); - d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() - d->device->ensureActiveTarget(); - - d->transferMode(BrushDrawingMode); -- glViewport(0, 0, d->width, d->height); -+ glViewport(d->x, d->y, d->width, d->height); - d->needsSync = false; - d->lastMaskTextureUsed = 0; - d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() - if (bounds == QRect(0, 0, width, height)) { - glDisable(GL_SCISSOR_TEST); - } else { -+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()); - glEnable(GL_SCISSOR_TEST); - setScissor(bounds); - } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() - - void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) - { -- const int left = rect.left(); -+ const int left = rect.left() + x; - const int width = rect.width(); - int bottom = height - (rect.top() + rect.height()); - if (device->paintFlipped()) { - bottom = rect.top(); - } -+ bottom += y; - const int height = rect.height(); -- - glScissor(left, bottom, width, height); - } - -diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index d51f0e5..0d4b38d 100644 ---- a/src/gui/opengl/qopenglpaintengine_p.h -+++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: - QOpenGL2PaintEngineEx* q; - QOpenGLEngineShaderManager* shaderManager; - QOpenGLPaintDevice* device; -+ int x, y; - int width, height; - QOpenGLContext *ctx; - EngineMode mode; -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); - - if (pex != 0) { -- glViewport(0, 0, pex->width, pex->height); -+ glViewport(pex->x, pex->y, pex->width, pex->height); - pex->updateClipScissorTest(); - } else { - m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); --- -1.7.9.5 - diff --git a/recipes/qt5/qtbase-5.3.1/qeglfshooks_imx5.cpp b/recipes/qt5/qtbase-5.3.1/qeglfshooks_imx5.cpp deleted file mode 100644 index 43e6d8d..0000000 --- a/recipes/qt5/qtbase-5.3.1/qeglfshooks_imx5.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** hacked by Eric Bénard - Eukréa Electromatique -** inspired from https://community.freescale.com/docs/DOC-94123 -** and from fbset.c http://users.telenet.be/geertu/Linux/fbdev/ -** -** based on qeglfshooks_imx6.cpp which is : -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include /* For O_RDWR */ -#include /* For open(), creat() */ -#include "qeglfshooks.h" -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QEglFSImx5Hooks : public QEglFSHooks -{ -public: - QEglFSImx5Hooks(); - virtual QSize screenSize() const; - virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); - virtual void destroyNativeWindow(EGLNativeWindowType window); - -private: - QSize mScreenSize; - EGLNativeDisplayType mNativeDisplay; -}; - - -QEglFSImx5Hooks::QEglFSImx5Hooks() -{ - int width, height; - /* code taken from fbset.c */ - int fh; - struct fb_var_screeninfo var; - fh = open("/dev/fb0", O_RDONLY); - ioctl(fh, FBIOGET_VSCREENINFO, &var); - mScreenSize.setHeight(var.yres); - mScreenSize.setWidth(var.xres); - close(fh); - mNativeDisplay = EGL_DEFAULT_DISPLAY; -} - -QSize QEglFSImx5Hooks::screenSize() const -{ - return mScreenSize; -} - -EGLNativeWindowType QEglFSImx5Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) -{ - Q_UNUSED(format); - - EGLNativeWindowType eglWindow = open("/dev/fb0", O_RDWR); - return eglWindow; -} - - -void QEglFSImx5Hooks::destroyNativeWindow(EGLNativeWindowType window) -{ - close(window); -} - -QEglFSImx5Hooks eglFSImx5Hooks; -QEglFSHooks *platformHooks = &eglFSImx5Hooks; - -QT_END_NAMESPACE diff --git a/recipes/qt5/qtbase-5.6.0 b/recipes/qt5/qtbase-5.6.0 new file mode 120000 index 0000000..41e6adc --- /dev/null +++ b/recipes/qt5/qtbase-5.6.0 @@ -0,0 +1 @@ +qmake5-5.6.0 \ No newline at end of file diff --git a/recipes/qt5/qtbase.inc b/recipes/qt5/qtbase.inc index 3909038..c4c40e9 100644 --- a/recipes/qt5/qtbase.inc +++ b/recipes/qt5/qtbase.inc @@ -80,7 +80,7 @@ QT_CONFIG_FLAGS += " \ \ -no-pch -no-rpath -no-nis -no-cups \ -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \ - -no-accessibility -no-sm -hostbindir \ + -accessibility -no-sm \ -system-libjpeg -system-libpng -system-zlib \ -linuxfb \ ${QT_WIDGETS} \ @@ -88,9 +88,36 @@ QT_CONFIG_FLAGS += " \ ${QT_DBUS} \ ${QT_XCB} \ ${QT_EXAMPLES} \ + ${QT_EGLFS} \ ${QT_TSLIB} \ ${QT_QMLDEBUG} \ " +PROVIDES_${PN} += "\ + libqt5core \ + libqt5concurrent \ + libqt5test \ + libqt5sql \ + libqt5xml \ + libqt5network \ + libqt5gui \ + libqt5widgets \ + libqt5printsupport \ +" +PROVIDES_${PN}-dev:>USE_qtopengl += " libqt5opengl-dev" +PROVIDES_${PN}-dev:>USE_qtdbus += " libqt5dbus-dev" +PROVIDES_${PN}-dev += "\ + libqt5core-dev \ + libqt5concurrent-dev \ + libqt5test-dev \ + libqt5sql-dev \ + libqt5xml-dev \ + libqt5network-dev \ + libqt5gui-dev \ + libqt5widgets-dev \ + libqt5printsupport-dev \ +" +PROVIDES_${PN}:>USE_qtopengl += " libqt5opengl" +PROVIDES_${PN}:>USE_qtdbus += " libqt5dbus" do_generateqtconfigfile[postfuncs] += "do_generateqtconfigfile_fixup" do_generateqtconfigfile_fixup() { @@ -108,7 +135,8 @@ QMAKE_MKSPEC_PATH = "${S}/mkspecs/" # another exception is that we need to run bin/qmake, because EffectivePaths # are relative to qmake location -OE_QMAKE_QMAKE_ORIG = "${STAGE_DIR}/native/bin/qmake" +OE_BUILD_BIN_DIR = "${BUILD_SYSROOT}${stage_bindir}" +OE_QMAKE_QMAKE_ORIG = "${OE_BUILD_BIN_DIR}/qmake" OE_QMAKE_QMAKE = "bin/qmake" # qtbase is exception, configure script is using our get(X)QEvalMakeConf @@ -132,20 +160,20 @@ do_configure() { mkdir ${S}/bin fi ln -sf ${OE_QMAKE_QMAKE_ORIG} ${S}/bin/qmake - ln -sf ${STAGE_DIR}/native/bin/moc ${S}/bin/moc - ln -sf ${STAGE_DIR}/native/bin/rcc ${S}/bin/rcc - ln -sf ${STAGE_DIR}/native/bin/uic ${S}/bin/uic + ln -sf ${OE_BUILD_BIN_DIR}/moc ${S}/bin/moc + ln -sf ${OE_BUILD_BIN_DIR}/rcc ${S}/bin/rcc + ln -sf ${OE_BUILD_BIN_DIR}/uic ${S}/bin/uic + ln -sf ${OE_BUILD_BIN_DIR}/qdoc ${S}/bin/qdoc if [ -n "$USE_qtdbus" ]; then - ln -sf ${STAGE_DIR}/native/bin/qdbuscpp2xml ${S}/bin/qdbuscpp2xml - ln -sf ${STAGE_DIR}/native/bin/qdbusxml2cpp ${S}/bin/qdbusxml2cpp + ln -sf ${OE_BUILD_BIN_DIR}/qdbuscpp2xml ${S}/bin/qdbuscpp2xml + ln -sf ${OE_BUILD_BIN_DIR}/qdbusxml2cpp ${S}/bin/qdbusxml2cpp fi fi ${S}/configure -v \ - -dont-process \ -opensource -confirm-license \ -no-gcc-sysroot \ - -prefix '...' \ + -prefix '${prefix}' \ -bindir ${OE_QMAKE_PATH_BINS} \ -libdir ${OE_QMAKE_PATH_LIBS} \ -datadir ${OE_QMAKE_PATH_DATA} \ @@ -160,14 +188,18 @@ do_configure() { -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ -testsdir ${OE_QMAKE_PATH_TESTS} \ -examplesdir ${OE_QMAKE_PATH_EXAMPLES} \ - -platform linux-oe-g++ \ + -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ + -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ + -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ + -platform ${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/linux-oe-g++ \ -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} - qmake5_base_do_configure + do_configure_qmake5_base echo "TARGET = \"realmoc\"" >> ${S}/src/tools/moc/moc.pro echo "TARGET = \"realrcc\"" >> ${S}/src/tools/rcc/rcc.pro echo "TARGET = \"realuic\"" >> ${S}/src/tools/uic/uic.pro + #echo "TARGET = \"realqdoc\"" >> ${S}/src/tools/qdoc/qdoc.pro if [ -n "$USE_qtdbus" ]; then echo "TARGET = \"realqdbuscpp2xml\"" >> ${S}/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro echo "TARGET = \"realqdbusxml2cpp\"" >> ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -206,6 +238,7 @@ QT_OPENGL_CONFIG_OPTION = "" DEPENDS += " ${QT_OPENGL_DEPENDS}" DEPENDS_${PN} += " ${QT_OPENGL_DEPENDS}" RDEPENDS_${PN} += " ${QT_OPENGL_DEPENDS}" +RDEPENDS_${PN}-dev:>USE_qtopengl += " ${QT_OPENGL_DEPENDS}" QT_CONFIG_FLAGS += "${QT_OPENGL_CONFIG_OPTION}" DEFAULT_USE_qtopengl_egl_flags = "-lEGL" DEFAULT_USE_qtopengl_flags = "-lGLU -lGL" @@ -215,22 +248,36 @@ DEFAULT_USE_qtopengl_es2_flags = "-lGLESv2 -lEGL" DEFAULT_USE_qtopengl_openvg_flags = "-lOpenVG" DEFAULT_USE_qtopengl_hooks_file = "none" QT_OPENGL_FIXUP_FUNCS = "" -QT_OPENGL_FIXUP_FUNCS:USE_qtopengl = "do_configure_opengl_libs" +QT_OPENGL_FIXUP_FUNCS:USE_qtopengl = "do_compile_opengl_libs" do_compile[prefuncs] =+ "${QT_OPENGL_FIXUP_FUNCS}" +USE_X11 = "0" +USE_X11:USE_qtx11 = "1" do_compile_opengl_libs () { sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + if [ "${USE_X11}" != "1" ]; then + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <USE_qtdirectfb = " directfb-dev libdirectfb" RDEPENDS_${PN}:>USE_qtdirectfb = " libdirectfb libdirect directfb-internal" -X11_EXTRA_DEPENDS = "libx11 libxft libxcb libxext libxrender libxrandr \ +X11_EXTRA_DEPENDS = "libx11 libxft libxcb \ + libx11-xcb libxcb libxcb-glx \ + libxcb-randr libxcb-render libxcb-shape \ + libxcb-shm libxcb-sync libxcb-xfixes \ + libxcb-util libxcb-util-wm libxcb-util-renderutil libxcb-util-image libxcb-util-keysyms \ + libxext libxrender libxrandr \ libxcursor freetype libxdamage libdl libxi \ - libxcb xcb-proto libpcre xinput libxi libstdc++ " + xcb-proto libpcre xinput libxi libstdc++ " +#libxcb-icccm libxcb-render-util libxcb-image libxcb-keysyms DEPENDS:>USE_qtx11 = " ${X11_EXTRA_DEPENDS}" DEPENDS_${PN}:>USE_qtx11 = " ${X11_EXTRA_DEPENDS}" RDEPENDS_${PN}:>USE_qtx11 = " ${X11_EXTRA_DEPENDS}" QT_XCB = " -no-xcb" -QT_XCB:USE_qtx11 = " -qt-xcb" +QT_XCB:USE_qtx11 = " -xcb -xcb-xlib -system-xcb -xrender " + +QT_EGLFS = "-eglfs" +QT_EGLFS:USE_qtx11 = "-no-eglfs" DEPENDS:>USE_qttslib = " tslib" RDEPENDS:>USE_qttslib = " tslib tslib-calibrate tslib-tests" @@ -268,6 +324,7 @@ QT_PHONON:USE_qtphonon = " -phonon" QT_DBUS = "-no-dbus" QT_DBUS:USE_qtdbus = " -dbus" DEPENDS:>USE_qtdbus = " libdbus" +DEPENDS_${PN}:>USE_qtdbus = " libdbus" RDEPENDS_${PN}:>USE_qtdbus = " libdbus" QT_EXAMPLES = "-nomake examples" @@ -290,10 +347,16 @@ do_install_qtfonts() { do_install[postfuncs] += "do_install_rm_qmake" do_install_rm_qmake() { - rm ${D}${bindir}/qmake + if [ -e ${D}${bindir}/qmake ]; then + rm ${D}${bindir}/qmake + fi } ################################## ### Packaging ################################## +PACKAGES =+ "${PN}-fonts-postscript " +FILES_${PN}-fonts-postscript = "${datadir}/fonts/*.pfa \ + ${datadir}/fonts/*.qpf* ${datadir}/fonts/*.pfb \ +" FILES_${PN} += "${datadir}/fonts/" diff --git a/recipes/qt5/qtbase_5.3.1.oe b/recipes/qt5/qtbase_5.3.1.oe deleted file mode 100644 index 0371735..0000000 --- a/recipes/qt5/qtbase_5.3.1.oe +++ /dev/null @@ -1,22 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += "\ - file://0001-Add-linux-oe-g-platform.patch \ - file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ - file://0011-QOpenGLPaintDevice-sub-area-support.patch \ - file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ -" - -SRC_URI += "file://qeglfshooks_imx5.cpp" - -QT_MTDEV_CONFIG = "-no-mtdev" -QT_MTDEV_CONFIG:USE_qtmtdev = "-mtdev" -QT_CONFIG_FLAGS += " ${QT_MTDEV_CONFIG}" diff --git a/recipes/qt5/qtbase_5.3.1.oe.sig b/recipes/qt5/qtbase_5.3.1.oe.sig deleted file mode 100644 index 6181b7d..0000000 --- a/recipes/qt5/qtbase_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4496edb8377e303f09145a1215f79e62e3a7ba11 qtbase-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtbase_5.6.0.oe b/recipes/qt5/qtbase_5.6.0.oe new file mode 100644 index 0000000..8631126 --- /dev/null +++ b/recipes/qt5/qtbase_5.6.0.oe @@ -0,0 +1,15 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI += "\ +file://0001-Add-linux-oe-g-platform.patch \ +file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ +file://0003-Add-external-hostbindir-option.patch \ +file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ +file://0006-QOpenGLPaintDevice-sub-area-support.patch \ +file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ +" + +QT_MTDEV_CONFIG = "-no-mtdev" +QT_MTDEV_CONFIG:USE_qtmtdev = "-mtdev" +QT_CONFIG_FLAGS += " ${QT_MTDEV_CONFIG}" diff --git a/recipes/qt5/qtbase_5.6.0.oe.sig b/recipes/qt5/qtbase_5.6.0.oe.sig new file mode 100644 index 0000000..3ef06b1 --- /dev/null +++ b/recipes/qt5/qtbase_5.6.0.oe.sig @@ -0,0 +1,2 @@ +b82d8248b8847870eafe7764e2af99e8f9bb6eba qtbase-opensource-src-5.6.0-rc.tar.xz +7536cb165f773efd2202dbb44d7ad0fe1ce66ce3 qtbase-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtdeclarative_5.3.1.oe.sig b/recipes/qt5/qtdeclarative_5.3.1.oe.sig deleted file mode 100644 index 3c9374a..0000000 --- a/recipes/qt5/qtdeclarative_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -8b22ade7d079af57237b833e798c6c7a51cc71ce qtdeclarative-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtdeclarative_5.3.1.oe b/recipes/qt5/qtdeclarative_5.6.0.oe similarity index 74% rename from recipes/qt5/qtdeclarative_5.3.1.oe rename to recipes/qt5/qtdeclarative_5.6.0.oe index 9e5088c..0d29945 100644 --- a/recipes/qt5/qtdeclarative_5.3.1.oe +++ b/recipes/qt5/qtdeclarative_5.6.0.oe @@ -10,8 +10,10 @@ inherit qt5module DEPENDS += "qtsvg-dev_${PV} qtxmlpatterns-dev_${PV} libstdc++ glib-dev" DEPENDS_${PN}-dev = "qtsvg-dev_${PV} qtxmlpatterns-dev_${PV} libstdc++" +DEPENDS_${PN} = "${PN}-dev_${PV} qtsvg_${PV} qtxmlpatterns_${PV} libstdc++" RDEPENDS_${PN} += "qtsvg_${PV} qtxmlpatterns_${PV} libstdc++" +PROVIDES_${PN} += "libqt5qml libqt5quicktest libqt5quickparticles libqt5quick libqt5quickwidgets" require qt5-${PV}.inc require qt5.inc diff --git a/recipes/qt5/qtdeclarative_5.6.0.oe.sig b/recipes/qt5/qtdeclarative_5.6.0.oe.sig new file mode 100644 index 0000000..938acd4 --- /dev/null +++ b/recipes/qt5/qtdeclarative_5.6.0.oe.sig @@ -0,0 +1 @@ +bc96a4275210981831cc0d7d39f7f48d674015a5 qtdeclarative-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtgraphicaleffects_5.3.1.oe b/recipes/qt5/qtgraphicaleffects_5.3.1.oe deleted file mode 100644 index faa2a0e..0000000 --- a/recipes/qt5/qtgraphicaleffects_5.3.1.oe +++ /dev/null @@ -1,16 +0,0 @@ -## Recipe for building the qt5 module QtGraphicalEffects. -## -## The Qt Graphical Effects Module is an extension to QtQuick which provides -## a ready-made set of shader effects to be used in QML. The module provides -## graphical effects such as blurring, colorization, drop shadows, and more. - -LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" - -inherit qt5module - -DEPENDS += "qtdeclarative-dev_${PV}" -DEPENDS_${PN}-dev += "qtdeclarative-dev_${PV}" -RDEPENDS_${PN} += "qtdeclarative_${PV}" - -require qt5-${PV}.inc -require qt5.inc diff --git a/recipes/qt5/qtgraphicaleffects_5.3.1.oe.sig b/recipes/qt5/qtgraphicaleffects_5.3.1.oe.sig deleted file mode 100644 index 33073a0..0000000 --- a/recipes/qt5/qtgraphicaleffects_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -94ae5864854b21d5c5242c6f1d5aab07fa9b0cfe qtgraphicaleffects-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtgraphicaleffects_5.6.0.oe b/recipes/qt5/qtgraphicaleffects_5.6.0.oe new file mode 100644 index 0000000..3e21922 --- /dev/null +++ b/recipes/qt5/qtgraphicaleffects_5.6.0.oe @@ -0,0 +1,13 @@ +LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" + +inherit qt5module + +DEPENDS += "libstdc++ libqt5quick" + +DEPENDS_${PN}-dev = "libstdc++" +DEPENDS_${PN} = "${PN}-dev_${PV} libstdc++" +RDEPENDS_${PN} += "libstdc++ libqt5quick" + +PROVIDES_${PN} += "" +require qt5-${PV}.inc +require qt5.inc diff --git a/recipes/qt5/qtgraphicaleffects_5.6.0.oe.sig b/recipes/qt5/qtgraphicaleffects_5.6.0.oe.sig new file mode 100644 index 0000000..fda1052 --- /dev/null +++ b/recipes/qt5/qtgraphicaleffects_5.6.0.oe.sig @@ -0,0 +1 @@ +99d7396d43f8bc67a60e5ff140b5e036b1c633a5 qtgraphicaleffects-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtjsbackend_5.1.1.oe b/recipes/qt5/qtjsbackend_5.1.1.oe deleted file mode 100644 index a9b5082..0000000 --- a/recipes/qt5/qtjsbackend_5.1.1.oe +++ /dev/null @@ -1,12 +0,0 @@ -## Recipe for building the qt5 module QtJsbackend. -## -## Recipe for building the Qt Javascript engine backend. -## Note that post qt 5.2, this module is no longer used for -## qtdeclarative, and no longer upgraded. - -LICENSE = "LGPL-2.1 & GPL-3.0" - -inherit qt5module - -require qt5-${PV}.inc -require qt5.inc diff --git a/recipes/qt5/qtjsbackend_5.1.1.oe.sig b/recipes/qt5/qtjsbackend_5.1.1.oe.sig deleted file mode 100644 index 2e64fb3..0000000 --- a/recipes/qt5/qtjsbackend_5.1.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -e13a5ef112bdbe2fb1691d21c52b287a21da614a qtjsbackend-opensource-src-5.1.1.tar.xz diff --git a/recipes/qt5/qtmultimedia_5.3.1.oe.sig b/recipes/qt5/qtmultimedia_5.3.1.oe.sig deleted file mode 100644 index 42c238d..0000000 --- a/recipes/qt5/qtmultimedia_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -61a9b5c3234db0291c86d51ca0d182047c5d517c qtmultimedia-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtmultimedia_5.3.1.oe b/recipes/qt5/qtmultimedia_5.6.0.oe similarity index 100% rename from recipes/qt5/qtmultimedia_5.3.1.oe rename to recipes/qt5/qtmultimedia_5.6.0.oe diff --git a/recipes/qt5/qtmultimedia_5.6.0.oe.sig b/recipes/qt5/qtmultimedia_5.6.0.oe.sig new file mode 100644 index 0000000..e31c231 --- /dev/null +++ b/recipes/qt5/qtmultimedia_5.6.0.oe.sig @@ -0,0 +1 @@ +46c68bae6a61d69b4760114b689b7a462aa68449 qtmultimedia-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtquick1_5.3.1.oe b/recipes/qt5/qtquick1_5.3.1.oe deleted file mode 100644 index dce2d55..0000000 --- a/recipes/qt5/qtquick1_5.3.1.oe +++ /dev/null @@ -1,14 +0,0 @@ -## Recipe for building the qt5 module QtQuick1. -## -## QtQuick Qt5 Module. - -LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" - -inherit qt5module -require qt5-${PV}.inc -require qt5.inc - -DEPENDS += "qtscript-dev_${PV} qtsvg-dev_${PV} qtxmlpatterns_${PV}" -DEPENDS_${PN} += "qtscript_${PV} qtsvg_${PV} qtxmlpatterns_${PV}" -RDEPENDS_${PN} += "qtscript_${PV} qtsvg_${PV} qtxmlpatterns_${PV}" -RDEPENDS_${PN}-dev += "qtscript-dev_${PV} qtsvg-dev_${PV} qtxmlpatterns-dev_${PV}" diff --git a/recipes/qt5/qtquick1_5.3.1.oe.sig b/recipes/qt5/qtquick1_5.3.1.oe.sig deleted file mode 100644 index ea3fa76..0000000 --- a/recipes/qt5/qtquick1_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -3fe4b64291fc8d1f4ef114bbb18ffb7904844455 qtquick1-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtquickcontrols2_5.6.0.oe b/recipes/qt5/qtquickcontrols2_5.6.0.oe new file mode 100644 index 0000000..7d84eb2 --- /dev/null +++ b/recipes/qt5/qtquickcontrols2_5.6.0.oe @@ -0,0 +1,10 @@ +LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" + +inherit qt5module +DEPENDS += "libqt5quick" +RDEPENDS_${PN} += "libqt5quick" + +require qt5-${PV}.inc +require qt5.inc + +FILES_${PN}-qmlplugins += "${OE_QMAKE_PATH_QML}" diff --git a/recipes/qt5/qtquickcontrols2_5.6.0.oe.sig b/recipes/qt5/qtquickcontrols2_5.6.0.oe.sig new file mode 100644 index 0000000..020915d --- /dev/null +++ b/recipes/qt5/qtquickcontrols2_5.6.0.oe.sig @@ -0,0 +1 @@ +06491bace7bcf1af0723e4d83f736dcd4a5778b4 qtquickcontrols2-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtquickcontrols_5.6.0.oe b/recipes/qt5/qtquickcontrols_5.6.0.oe new file mode 100644 index 0000000..7d84eb2 --- /dev/null +++ b/recipes/qt5/qtquickcontrols_5.6.0.oe @@ -0,0 +1,10 @@ +LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" + +inherit qt5module +DEPENDS += "libqt5quick" +RDEPENDS_${PN} += "libqt5quick" + +require qt5-${PV}.inc +require qt5.inc + +FILES_${PN}-qmlplugins += "${OE_QMAKE_PATH_QML}" diff --git a/recipes/qt5/qtquickcontrols_5.6.0.oe.sig b/recipes/qt5/qtquickcontrols_5.6.0.oe.sig new file mode 100644 index 0000000..8d7592c --- /dev/null +++ b/recipes/qt5/qtquickcontrols_5.6.0.oe.sig @@ -0,0 +1 @@ +6a6f376f857eb52e990e405671eb98997d59db7a qtquickcontrols-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtscript_5.3.1.oe.sig b/recipes/qt5/qtscript_5.3.1.oe.sig deleted file mode 100644 index a895407..0000000 --- a/recipes/qt5/qtscript_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4cfa13724e9957dbbee19c6dffa8a5b1c33d0e05 qtscript-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtscript_5.3.1.oe b/recipes/qt5/qtscript_5.6.0.oe similarity index 100% rename from recipes/qt5/qtscript_5.3.1.oe rename to recipes/qt5/qtscript_5.6.0.oe diff --git a/recipes/qt5/qtscript_5.6.0.oe.sig b/recipes/qt5/qtscript_5.6.0.oe.sig new file mode 100644 index 0000000..b9928c9 --- /dev/null +++ b/recipes/qt5/qtscript_5.6.0.oe.sig @@ -0,0 +1 @@ +2c37d1a46c4a4416a43da484e0487143b35aeb2f qtscript-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtsensors_5.3.1.oe.sig b/recipes/qt5/qtsensors_5.3.1.oe.sig deleted file mode 100644 index 0e0698f..0000000 --- a/recipes/qt5/qtsensors_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4e5b3ca414db68036413b764a0241d96cc569488 qtsensors-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtsensors_5.3.1.oe b/recipes/qt5/qtsensors_5.6.0.oe similarity index 100% rename from recipes/qt5/qtsensors_5.3.1.oe rename to recipes/qt5/qtsensors_5.6.0.oe diff --git a/recipes/qt5/qtsensors_5.6.0.oe.sig b/recipes/qt5/qtsensors_5.6.0.oe.sig new file mode 100644 index 0000000..630b0e4 --- /dev/null +++ b/recipes/qt5/qtsensors_5.6.0.oe.sig @@ -0,0 +1 @@ +a9bd0f4e76cb7ee4a83b8082261b60e1c8a42304 qtsensors-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtsvg_5.3.1.oe.sig b/recipes/qt5/qtsvg_5.3.1.oe.sig deleted file mode 100644 index de60d43..0000000 --- a/recipes/qt5/qtsvg_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -81d2e97082f9bd59b6a644bd3207e7cb5a07831a qtsvg-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtsvg_5.3.1.oe b/recipes/qt5/qtsvg_5.6.0.oe similarity index 84% rename from recipes/qt5/qtsvg_5.3.1.oe rename to recipes/qt5/qtsvg_5.6.0.oe index a1fa24a..d034b8c 100644 --- a/recipes/qt5/qtsvg_5.3.1.oe +++ b/recipes/qt5/qtsvg_5.6.0.oe @@ -8,6 +8,7 @@ LICENSE = "GFDL-1.3 & LGPL-2.1 & GPL-3.0" inherit qt5module - +PROVIDES_${PN} += "libqt5svg" +PROVIDES_${PN}-dev += "libqt5svg-dev" require qt5-${PV}.inc require qt5.inc diff --git a/recipes/qt5/qtsvg_5.6.0.oe.sig b/recipes/qt5/qtsvg_5.6.0.oe.sig new file mode 100644 index 0000000..81b1848 --- /dev/null +++ b/recipes/qt5/qtsvg_5.6.0.oe.sig @@ -0,0 +1,2 @@ +f7f130bca3ac78b72926ccb02d73d5b556e7ac7f qtsvg-opensource-src-5.6.0-rc.tar.xz +a37df253ed84cddd73e78ac6e1e07f01930dc239 qtsvg-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qttools_5.3.1.oe.sig b/recipes/qt5/qttools_5.3.1.oe.sig deleted file mode 100644 index af4b42c..0000000 --- a/recipes/qt5/qttools_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -6b8a31f68c9827afb9a02121c581d910ad3488c8 qttools-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qttools_5.3.1.oe b/recipes/qt5/qttools_5.6.0.oe similarity index 95% rename from recipes/qt5/qttools_5.3.1.oe rename to recipes/qt5/qttools_5.6.0.oe index 30a4108..92fbaec 100644 --- a/recipes/qt5/qttools_5.3.1.oe +++ b/recipes/qt5/qttools_5.6.0.oe @@ -13,5 +13,6 @@ inherit qt5module require qt5-${PV}.inc require qt5.inc +DEPENDS += "qtdeclarative" OE_QMAKE_LDFLAGS += " -L${STAGE_DIR}/machine/lib/" diff --git a/recipes/qt5/qttools_5.6.0.oe.sig b/recipes/qt5/qttools_5.6.0.oe.sig new file mode 100644 index 0000000..fb482be --- /dev/null +++ b/recipes/qt5/qttools_5.6.0.oe.sig @@ -0,0 +1 @@ +22c9ad55d9b5592085bf0d353c2fc7c6264145e7 qttools-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtwebsockets.inc b/recipes/qt5/qtwebsockets.inc new file mode 100644 index 0000000..45623b3 --- /dev/null +++ b/recipes/qt5/qtwebsockets.inc @@ -0,0 +1,14 @@ +## Recipe for building the qt5 module QtWebsockets. +## +## Qt Websockets + +LICENSE = "LGPL-2.1" + +inherit qt5module + +DEPENDS += "qtdeclarative" +DEPENDS += "qtsvg qtxmlpatterns libstdc++ glib" +RDEPENDS_${PN} += "libdl libqt5sql libqt5network libqt5core libpthread libstdc++ libm libgcc libc" +PROVIDES_${PN} += "libqt5websockets" +require qt5-${PV}.inc +require qt5.inc diff --git a/recipes/qt5/qtwebsockets_5.6.0.oe b/recipes/qt5/qtwebsockets_5.6.0.oe new file mode 100644 index 0000000..bd54419 --- /dev/null +++ b/recipes/qt5/qtwebsockets_5.6.0.oe @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/recipes/qt5/qtwebsockets_5.6.0.oe.sig b/recipes/qt5/qtwebsockets_5.6.0.oe.sig new file mode 100644 index 0000000..6937b6c --- /dev/null +++ b/recipes/qt5/qtwebsockets_5.6.0.oe.sig @@ -0,0 +1 @@ +4e078a30c1e277cdbefc64dbb32017b6b731bf00 qtwebsockets-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtx11extras_5.3.1.oe.sig b/recipes/qt5/qtx11extras_5.3.1.oe.sig deleted file mode 100644 index e70b040..0000000 --- a/recipes/qt5/qtx11extras_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -1229ec23fd6787a427fa3c44faaadcb37d8d4c33 qtx11extras-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtx11extras_5.3.1.oe b/recipes/qt5/qtx11extras_5.6.0.oe similarity index 100% rename from recipes/qt5/qtx11extras_5.3.1.oe rename to recipes/qt5/qtx11extras_5.6.0.oe diff --git a/recipes/qt5/qtx11extras_5.6.0.oe.sig b/recipes/qt5/qtx11extras_5.6.0.oe.sig new file mode 100644 index 0000000..ba2b9ac --- /dev/null +++ b/recipes/qt5/qtx11extras_5.6.0.oe.sig @@ -0,0 +1 @@ +7ed90b901890311ed78c128b07c52d226b592c04 qtx11extras-opensource-src-5.6.0.tar.xz diff --git a/recipes/qt5/qtxmlpatterns_5.3.1.oe.sig b/recipes/qt5/qtxmlpatterns_5.3.1.oe.sig deleted file mode 100644 index bda6525..0000000 --- a/recipes/qt5/qtxmlpatterns_5.3.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -5ae55208ffd170fcbdbdc560cf619415b6b06b7b qtxmlpatterns-opensource-src-5.3.1.tar.xz diff --git a/recipes/qt5/qtxmlpatterns_5.3.1.oe b/recipes/qt5/qtxmlpatterns_5.6.0.oe similarity index 100% rename from recipes/qt5/qtxmlpatterns_5.3.1.oe rename to recipes/qt5/qtxmlpatterns_5.6.0.oe diff --git a/recipes/qt5/qtxmlpatterns_5.6.0.oe.sig b/recipes/qt5/qtxmlpatterns_5.6.0.oe.sig new file mode 100644 index 0000000..ad8b75e --- /dev/null +++ b/recipes/qt5/qtxmlpatterns_5.6.0.oe.sig @@ -0,0 +1 @@ +7d7b98617f2d03dfd869590fe9c75fdd209d2af4 qtxmlpatterns-opensource-src-5.6.0.tar.xz diff --git a/recipes/qwt/qwt.inc b/recipes/qwt/qwt.inc new file mode 100644 index 0000000..860aa7b --- /dev/null +++ b/recipes/qwt/qwt.inc @@ -0,0 +1,56 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" + +inherit qt5module +inherit qmake5 c++ +inherit auto-package-libs +AUTO_PACKAGE_LIBS = "qwt" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" + +require conf/fetch/sourceforge.conf +SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ +" + +DEPENDS += "libstdc++ qtbase qtsvg-dev" + +do_configure[prefuncs] =+ "do_configure_prepend" +do_configure_prepend() { + sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri + sed -e 's/^\(QWT_CONFIG\s\+[+]=\s\+QwtDesigner\)/#\1/' -i qwtconfig.pri + sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri +} + +do_install_qmake5_base() { + oe_runmake -e install + install -d ${D}${datadir}/doc/${PN} + mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ + rmdir ${D}${prefix}/doc + cd ${S}/examples + install -d ${D}/${bindir} + if [ -d bin/ ]; then + cd bin/ + for i in * ; do + cp -pPR $i ${D}/${bindir}/$i + done + fi + if [ -d ${D}${prefix}/plugins ]; then + install -d ${D}${libdir} + mv ${D}${prefix}/plugins ${D}${libdir} + fi +} + +PACKAGES =+ "${PN}-examples ${PN}-features ${PN}-plugins " +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-features = "${prefix}/features" +FILES_${PN}-plugins = "${OE_QMAKE_PATH_PLUGINS}/designer/*.so" +FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/plugins/designer/.debug" +FILES_${PN}-libqwt-dev += "${includedir}" +DEPENDS_${PN}-libqwt-dev += "${PN}-features" + +COM_DEP = "libc libdl libegl libgal libgcc libglesv2 libm libpthread \ + libqt5concurrent libqt5core libqt5gui libqt5opengl libqt5printsupport \ + libqt5svg libqt5widgets libstdc++ \ +" +DEPENDS_${PN}-libqwt += "${COM_DEP}" +RDEPENDS_${PN}-libqwt += "${COM_DEP}" diff --git a/recipes/qwt/qwt_6.1.2.oe b/recipes/qwt/qwt_6.1.2.oe new file mode 100644 index 0000000..2ce2492 --- /dev/null +++ b/recipes/qwt/qwt_6.1.2.oe @@ -0,0 +1 @@ +require qwt.inc diff --git a/recipes/qwt/qwt_6.1.2.oe.sig b/recipes/qwt/qwt_6.1.2.oe.sig new file mode 100644 index 0000000..142b0bf --- /dev/null +++ b/recipes/qwt/qwt_6.1.2.oe.sig @@ -0,0 +1 @@ +6af82b6ee4132f779d1c8c2db872f01463b0d61c qwt-6.1.2.tar.bz2 diff --git a/recipes/sdk/qt5-sdk-script.oe b/recipes/sdk/qt5-sdk-script.oe index ffccec2..5b9e05b 100644 --- a/recipes/sdk/qt5-sdk-script.oe +++ b/recipes/sdk/qt5-sdk-script.oe @@ -2,10 +2,18 @@ DESCRIPTION = "Setup script needed for the QT5 sdk" RECIPE_TYPES = "canadian-cross" -SRC_URI += "file://setup.sh" +SRC_URI += "file://setup.sh.in" +S = "${SRCDIR}" +#DEPENDS = "native:util/sed" +CLASS_DEPENDS = "" + +do_compile () { + sed -e 's/__TARGET_PREFIX__/${TARGET_PREFIX}/' \ + setup.sh.in > setup.sh +} do_install () { - cp ${SRCDIR}/setup.sh ${D} + install -m 0775 ${SRCDIR}/setup.sh ${D} } QT5_TOOLS="host:qmake5-utilities" diff --git a/recipes/sdk/qt5-sdk-script/setup.sh b/recipes/sdk/qt5-sdk-script/setup.sh.in old mode 100755 new mode 100644 similarity index 94% rename from recipes/sdk/qt5-sdk-script/setup.sh rename to recipes/sdk/qt5-sdk-script/setup.sh.in index d873b3e..8e1524c --- a/recipes/sdk/qt5-sdk-script/setup.sh +++ b/recipes/sdk/qt5-sdk-script/setup.sh.in @@ -1,8 +1,7 @@ #!/bin/bash # Script used to setup the enviroment for Qmake # Preconditions: -# The following environemt settings are needed prior to invoking the script: -# * CROSS_COMPILE must be set, e.g. CROSS_COMPILE=arm-cortexa9neont-linux-gnueabi- +# The following environemt setting is needed prior to invoking the script: # * Host executeable must be in the path (/bin) # # Note: The script can be run on Windows too with MSYS installed @@ -10,6 +9,8 @@ CURRENT_OS=$(uname) +export CROSS_COMPILE=__TARGET_PREFIX__ + echo "Script detected it is running on:" if [[ $CURRENT_OS == Linux* ]] ; then echo "Linux"