From ec0ac6e5b1682b7a448eb50666cb8330928c9d74 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 23 Oct 2012 15:50:41 -0200 Subject: [PATCH 001/347] Add layer basic structure Signed-off-by: Otavio Salvador --- README | 16 ++++++++++++++++ conf/layer.conf | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 README create mode 100644 conf/layer.conf diff --git a/README b/README new file mode 100644 index 0000000000..c0132b0173 --- /dev/null +++ b/README @@ -0,0 +1,16 @@ +This layer depends on: + +URI: git://git.openembedded.org/openembedded-core +branch: master +revision: HEAD + +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5]' in the subject' + +When sending single patches, please use something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-qt5][PATCH' + +You are encouraged to fork the mirror on github https://github.com/meta-qt5/meta-qt5/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. + +Main layer maintainers: + + Martin 'JaMa' Jansa + Otavio Salvador diff --git a/conf/layer.conf b/conf/layer.conf new file mode 100644 index 0000000000..7730dc279a --- /dev/null +++ b/conf/layer.conf @@ -0,0 +1,24 @@ +# It really depends on order of the layers appearing in BBLAYERS +# variable in toplevel bblayers.conf file, where bitbake will search +# for .inc files and others where bitbake uses BBPATH since it will +# search the directories from first to last as specified in BBPATH +# Therefore if you want a given layer to be considered high priority +# for the .inc and .conf etc. then consider it adding at the beginning +# of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve +# the recipe contention so the order of directories in BBFILES does +# not matter. + +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "qt5-layer" +BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" + +# Define the priority for recipes (.bb files) from this layer, +# choosing carefully how this layer interacts with all of the +# other layers. + +BBFILE_PRIORITY_systemd-layer = "7" From 4927bd8c5675151188efa8b4d36bba9640ee3556 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 23 Oct 2012 15:51:25 -0200 Subject: [PATCH 002/347] qt5-native: Add initial draft Signed-off-by: Otavio Salvador --- recipes-qt/qt5/qt5-native.inc | 49 ++++++++++++++++++++++++++++++ recipes-qt/qt5/qt5-native_5.0.0.bb | 6 ++++ recipes-qt/qt5/qt5.inc | 8 +++++ 3 files changed, 63 insertions(+) create mode 100644 recipes-qt/qt5/qt5-native.inc create mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb create mode 100644 recipes-qt/qt5/qt5.inc diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc new file mode 100644 index 0000000000..f46817d389 --- /dev/null +++ b/recipes-qt/qt5/qt5-native.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" +DEPENDS = "zlib-native dbus-native" +SECTION = "libs" +HOMEPAGE = "http://qt-project.org" +PROVIDES = "qt5-tools-native" + +LICENSE = "LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=cc5963be04f8b19c3e3c46bc31f0f6e1 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" + +INC_PR = "r0" + +include qt5.inc + +inherit native + +QT_MODULE = "qtbase" + +EXTRA_OECONF = "-prefix ${prefix} \ + -L ${STAGING_LIBDIR_NATIVE} \ + -I ${STAGING_INCDIR_NATIVE} \ + -system-zlib \ + -no-libjpeg \ + -no-libpng \ + -no-gif \ + -no-accessibility \ + -no-cups \ + -no-nis \ + -no-gui \ + -no-qml-debug \ + -no-sql-mysql \ + -no-sql-sqlite \ + -no-opengl \ + -no-openssl \ + -verbose -release \ + -headerdir ${includedir}/qt5 \ + -no-glib \ + -no-iconv \ + -no-fast \ + -silent \ + -no-rpath" + +do_configure() { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb new file mode 100644 index 0000000000..a3e5e76923 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0.bb @@ -0,0 +1,6 @@ +require qt5-native.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "2e1e5198a3a139099bfefe75ed29e043" +SRC_URI[sha256sum] = "d1a6b06fb3d44e83bbd5b7fe5bc1177ff437f992efafe0154cf37b18cfa87109" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc new file mode 100644 index 0000000000..ff5f2b1cc7 --- /dev/null +++ b/recipes-qt/qt5/qt5.inc @@ -0,0 +1,8 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +QT_MODULE ?= "${PN}" +QT_VERSION ?= "${PV}-beta1" + +SRC_URI = "http://releases.qt-project.org/qt5.0/beta1/split_sources/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" From c1d83958f5887c1988d56dcffb4596bb9f7ab6cb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Oct 2012 20:13:45 +0200 Subject: [PATCH 003/347] layer.conf: fix BBFILE_PRIORITY Signed-off-by: Martin Jansa --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 7730dc279a..2aee9a5599 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -21,4 +21,4 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" # choosing carefully how this layer interacts with all of the # other layers. -BBFILE_PRIORITY_systemd-layer = "7" +BBFILE_PRIORITY_qt5-layer = "7" From 671410bb4080909ff9e112c584bd9348718be942 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 24 Oct 2012 15:28:08 -0700 Subject: [PATCH 004/347] qt5-native now compiles and installs Disabled tests and exmaples in the native build. Also do_install now installs the qmake host binary Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5-native.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index f46817d389..048bf41031 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -39,6 +39,8 @@ EXTRA_OECONF = "-prefix ${prefix} \ -no-iconv \ -no-fast \ -silent \ + -nomake examples \ + -nomake tests \ -no-rpath" do_configure() { @@ -47,3 +49,9 @@ do_configure() { (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } + +do_install() { + install -d ${D}${bindir}/ + # Install only the qmake bin for now. + install -m 0755 ${S}/bin/qmake ${D}${bindir}/qmake +} From bc43214dd2c706e91a4c13dcedb56af9c09e4cf4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Oct 2012 22:28:38 +0200 Subject: [PATCH 005/347] qt5-native: disable demos Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 048bf41031..f164a8f120 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -41,7 +41,9 @@ EXTRA_OECONF = "-prefix ${prefix} \ -silent \ -nomake examples \ -nomake tests \ - -no-rpath" + -nomake demos \ + -no-rpath \ +" do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) From 3546f08c5b286913d21245ca6c531c67b3729e09 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Oct 2012 22:32:08 +0200 Subject: [PATCH 006/347] qt5-native: install all native tools * e.g. we need qdbusxml2cpp to build connman-qt Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index f164a8f120..1fe344578a 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -53,7 +53,8 @@ do_configure() { } do_install() { - install -d ${D}${bindir}/ - # Install only the qmake bin for now. - install -m 0755 ${S}/bin/qmake ${D}${bindir}/qmake + install -d ${D}${bindir}/ + for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt; do + install -v -m 0755 bin/${i} ${D}${bindir}/${i} + done } From 8eec0155083e62a07265daf15c110b0b33b1a301 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 15 Nov 2012 19:35:58 +0100 Subject: [PATCH 007/347] qt5-native: change PV of 5.0.0-beta2 to sort lower then 5.0.0 when it's released * also add version specific .inc files and move all version specific variables to it * upgrade 5.0.0-beta1 to 5.0.0-beta2 and add include for latest git Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc | 15 +++++++++++++++ recipes-qt/qt5/qt5-4.999+git.inc | 18 ++++++++++++++++++ recipes-qt/qt5/qt5-native.inc | 7 ------- recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb | 7 +++++++ recipes-qt/qt5/qt5-native_4.999+git.bb | 6 ++++++ recipes-qt/qt5/qt5-native_5.0.0.bb | 6 ------ 6 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc create mode 100644 recipes-qt/qt5/qt5-4.999+git.inc create mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb create mode 100644 recipes-qt/qt5/qt5-native_4.999+git.bb delete mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc new file mode 100644 index 0000000000..36ac896d06 --- /dev/null +++ b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc @@ -0,0 +1,15 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +QT_VERSION ?= "5.0.0-beta2" + +SRC_URI += " \ + http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc new file mode 100644 index 0000000000..b0fca1de6a --- /dev/null +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -0,0 +1,18 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +# each module needs to define valid SRCREV +SRC_URI += " \ + git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git \ +" + +S = "${WORKDIR}/git" + +PV = "4.999+5.0.0-beta2+gitr${SRCPV}" + +DEFAULT_PREFERENCE = "-1" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 1fe344578a..76e2277dc9 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -4,15 +4,8 @@ SECTION = "libs" HOMEPAGE = "http://qt-project.org" PROVIDES = "qt5-tools-native" -LICENSE = "LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=cc5963be04f8b19c3e3c46bc31f0f6e1 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" - INC_PR = "r0" -include qt5.inc - inherit native QT_MODULE = "qtbase" diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb new file mode 100644 index 0000000000..5891541417 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb @@ -0,0 +1,7 @@ +require qt5-native.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" +SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb new file mode 100644 index 0000000000..b6072fa3a1 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -0,0 +1,6 @@ +require qt5-native.inc +require qt5-4.999+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9" diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb deleted file mode 100644 index a3e5e76923..0000000000 --- a/recipes-qt/qt5/qt5-native_5.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-native.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "2e1e5198a3a139099bfefe75ed29e043" -SRC_URI[sha256sum] = "d1a6b06fb3d44e83bbd5b7fe5bc1177ff437f992efafe0154cf37b18cfa87109" From 4ec2e9d2d8184f4da4de86711db34012317f3114 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Thu, 25 Oct 2012 14:12:21 -0700 Subject: [PATCH 008/347] qt5-native: install mkspecs and our g++.conf + linux.conf Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/files/g++.conf | 56 ++++++++++++++++++++ recipes-qt/qt5/files/linux.conf | 66 ++++++++++++++++++++++++ recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc | 2 + recipes-qt/qt5/qt5-4.999+git.inc | 2 + recipes-qt/qt5/qt5-native.inc | 4 ++ 5 files changed, 130 insertions(+) create mode 100644 recipes-qt/qt5/files/g++.conf create mode 100644 recipes-qt/qt5/files/linux.conf diff --git a/recipes-qt/qt5/files/g++.conf b/recipes-qt/qt5/files/g++.conf new file mode 100644 index 0000000000..e58fb15718 --- /dev/null +++ b/recipes-qt/qt5/files/g++.conf @@ -0,0 +1,56 @@ +# +# qmake configuration for common 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, + +# some linking helper... +CONFIG += rpath_libdirs + +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) diff --git a/recipes-qt/qt5/files/linux.conf b/recipes-qt/qt5/files/linux.conf new file mode 100644 index 0000000000..86703813ca --- /dev/null +++ b/recipes-qt/qt5/files/linux.conf @@ -0,0 +1,66 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = +QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL +QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_EGL = +QMAKE_LIBDIR_EGL = +QMAKE_INCDIR_OPENVG = +QMAKE_LIBDIR_OPENVG = + + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) +QMAKE_LIBS_NIS = -lnsl +QMAKE_LIBS_EGL = -lEGL +QMAKE_LIBS_OPENGL = -lGL +QMAKE_LIBS_OPENGL_QT = -lGL +QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 +QMAKE_LIBS_OPENVG = -lOpenVG +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = objcopy +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +include(unix.conf) diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc index 36ac896d06..a0bc754d9a 100644 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc +++ b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc @@ -4,6 +4,8 @@ QT_VERSION ?= "5.0.0-beta2" SRC_URI += " \ http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + file://linux.conf \ + file://g++.conf \ " S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index b0fca1de6a..2d5bd2b971 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -3,6 +3,8 @@ # each module needs to define valid SRCREV SRC_URI += " \ git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git \ + file://linux.conf \ + file://g++.conf \ " S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 76e2277dc9..e34bd958c9 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -50,4 +50,8 @@ do_install() { for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt; do install -v -m 0755 bin/${i} ${D}${bindir}/${i} done + install -d ${D}${datadir}/qt5/ + cp -PfR mkspecs ${D}${datadir}/qt5/ + cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt5/mkspecs/common/g++-unix.conf + cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt5/mkspecs/common/ } From 13ed17b2baeb253961885c469ba3c97b9ed420e5 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Thu, 15 Nov 2012 20:38:27 +0100 Subject: [PATCH 009/347] qtbase: add recipe for git version Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 22 +++++ classes/qmake5_base.bbclass | 35 ++++++++ recipes-qt/qt5/files/qmake-build.conf.sh | 31 +++++++ recipes-qt/qt5/files/qmake.conf.sh | 39 +++++++++ recipes-qt/qt5/files/qplatformdefs.h | 1 + recipes-qt/qt5/qt5.inc | 86 ++++++++++++++++++- recipes-qt/qt5/qt5_arch.inc | 19 ++++ recipes-qt/qt5/qtbase.inc | 23 +++++ ...owing-the-customization-of-the-paths.patch | 37 ++++++++ ...ow-to-set-qt.conf-from-the-outside-u.patch | 44 ++++++++++ ...is-already-built-in-qt5-tools-native.patch | 29 +++++++ ...ding-a-separate-qmake-for-the-target.patch | 28 ++++++ recipes-qt/qt5/qtbase_4.999+git.bb | 6 ++ 13 files changed, 397 insertions(+), 3 deletions(-) create mode 100644 classes/qmake5.bbclass create mode 100644 classes/qmake5_base.bbclass create mode 100644 recipes-qt/qt5/files/qmake-build.conf.sh create mode 100644 recipes-qt/qt5/files/qmake.conf.sh create mode 100644 recipes-qt/qt5/files/qplatformdefs.h create mode 100644 recipes-qt/qt5/qt5_arch.inc create mode 100644 recipes-qt/qt5/qtbase.inc create mode 100644 recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch create mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch create mode 100644 recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase_4.999+git.bb diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass new file mode 100644 index 0000000000..b30b150720 --- /dev/null +++ b/classes/qmake5.bbclass @@ -0,0 +1,22 @@ +# +# QMake variables for Qt +# +inherit qmake5_base + +QT5TOOLSDEPENDS ?= "qt5-native " +DEPENDS_prepend = "${QT5TOOLSDEPENDS}" + +export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" +export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" +export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" +export OE_QMAKE_LINK = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +export OE_QMAKE_LIBS_X11SM = "-lSM -lICE" +export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" +export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass new file mode 100644 index 0000000000..fc90429fd5 --- /dev/null +++ b/classes/qmake5_base.bbclass @@ -0,0 +1,35 @@ + +# We override this completely to eliminate the -e normally passed in +EXTRA_OEMAKE = ' MAKEFLAGS= ' + +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_AR="${AR} cqs" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," + +# do not export STRIP to the environment +STRIP[unexport] = "1" + +do_generate_qt_config_file() { + export QT_CONF_PATH=${WORKDIR}/qt.conf + cat > ${WORKDIR}/qt.conf < mkspecs/${TARGET_OS}-oe-g++/qmake.conf + + mkdir -p mkspecs/build-oe-g++ + cp -f ${WORKDIR}/qplatformdefs.h mkspecs/build-oe-g++ + + ## FIXME, the file nameing is dumb... + cp ${WORKDIR}/qmake-build.conf.sh mkspecs/build-oe-g++/qmake.conf + + ./configure -v \ + -opensource -confirm-license \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -datadir ${datadir}/${QT_DIR_NAME} \ + -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ + -docdir ${docdir}/${QT_DIR_NAME} \ + -headerdir ${includedir}/${QT_DIR_NAME} \ + -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ + -importdir ${libdir}/${QT_DIR_NAME}/imports \ + -translationdir ${datadir}/${QT_DIR_NAME}/translations \ + -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -shared \ + -no-rpath \ + -platform build-oe-g++ \ + -xplatform ${TARGET_OS}-oe-g++ \ + ${QT_TESTS} \ + ${QT_EXAMPLES} \ + ${QT_DEMOS} \ + ${QT_CONFIG_FLAGS} -no-fast +} + +do_compile() { + unset CFLAGS CXXFLAGS AR + + export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" + + oe_runmake +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" +FILES_${PN}-dev = "${libdir}/cmake/* ${libdir}/pkgconfig/*.pc ${libdir}/*.la ${libdir}/*.prl ${includedir}/qt5/*" +FILES_${PN}-staticdev = "${libdir}/libQt*.a" diff --git a/recipes-qt/qt5/qt5_arch.inc b/recipes-qt/qt5/qt5_arch.inc new file mode 100644 index 0000000000..7048d7a368 --- /dev/null +++ b/recipes-qt/qt5/qt5_arch.inc @@ -0,0 +1,19 @@ +inherit siteinfo + +set_arch() { + case ${TARGET_ARCH} in + arm*) QT_ARCH=arm ;; + i*86*) QT_ARCH=i386 ;; + mips*) QT_ARCH=mips ;; + powerpc*) QT_ARCH=powerpc ;; + x86_64*) QT_ARCH=x86_64 ;; + esac +} + +set_endian() { + if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then + QT_ENDIAN="-little-endian" + elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then + QT_ENDIAN="-big-endian" + fi +} diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc new file mode 100644 index 0000000000..235029b0aa --- /dev/null +++ b/recipes-qt/qt5/qtbase.inc @@ -0,0 +1,23 @@ +require qt5.inc + +SRC_URI += " \ + file://0001-Allowing-the-customization-of-the-paths.patch \ + file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ + file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ +" +#file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch + +# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h +DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms" + +INC_PR = "r0" + +QT_BASE_NAME = "qt5" +QT_DIR_NAME = "qt5" + +export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" + +# Qt uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" + +inherit qmake5 diff --git a/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch b/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch new file mode 100644 index 0000000000..073df37872 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch @@ -0,0 +1,37 @@ +From 183cf66e2770f7fbc420cf7aa94a9a8564785044 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Wed, 7 Nov 2012 14:48:46 -0800 +Subject: [PATCH] Allowing the customization of the paths + +Signed-off-by: Mikko Levonmaa +--- + src/corelib/global/qlibraryinfo.cpp | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index ccf0718..487b8eb 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -49,6 +49,7 @@ + QT_BEGIN_NAMESPACE + extern QString qt_libraryInfoFile(); + QT_END_NAMESPACE ++#include + #elif defined(QT_BOOTSTRAPPED) + QString qt_libraryInfoFile() + { +@@ -164,6 +165,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + } + #endif ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); ++ } + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + return 0; //no luck +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..6b5bed9a2c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,44 @@ +From d5a0cf45ebbd6a5911f8bd208fe355eb990b5388 Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH] 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 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index ccf0718..497e72e 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -49,6 +49,8 @@ + QT_BEGIN_NAMESPACE + extern QString qt_libraryInfoFile(); + QT_END_NAMESPACE ++#include ++#include + #elif defined(QT_BOOTSTRAPPED) + QString qt_libraryInfoFile() + { +@@ -142,6 +143,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + #ifdef QT_BOOTSTRAPPED + if(!QFile::exists(qtconfig)) + qtconfig = qt_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ printf("using qt.conf %s", qtconfig.toLatin1().data()); ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch b/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch new file mode 100644 index 0000000000..0c1f63c69e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch @@ -0,0 +1,29 @@ +From aab01049543f4508f1dc92fb62b980d1d0c3bcc0 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH] qmake is already built in qt5-tools-native + +Ported from OE by: Yu Ke +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index c3e61d6..5e43a19 100755 +--- a/configure ++++ b/configure +@@ -3594,7 +3594,7 @@ setBootstrapVariable() + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 0000000000..781d6e549b --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,28 @@ +From a2a01e1fd975e8e616b580423c3bf30db9c11b6d Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +--- + qmake/qmake.pro | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..07fa80e 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 = qmake2 + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb new file mode 100644 index 0000000000..fe8fd1e571 --- /dev/null +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -0,0 +1,6 @@ +require qtbase.inc +require qt5-4.999+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9" From 870536b3be3c03672060c1954985ba4554871c09 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 15 Nov 2012 20:44:00 +0100 Subject: [PATCH 010/347] qtbase: add recipe for 5.0.0-beta2 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb new file mode 100644 index 0000000000..2639d12b0f --- /dev/null +++ b/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb @@ -0,0 +1,7 @@ +require qtbase.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" +SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" From edb7f7413e706d0de9d169cd9af6f33a86bd712c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 18 Nov 2012 18:00:35 +0100 Subject: [PATCH 011/347] qt5-native: add -qt-xcb to EXTRA_OECONF Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 54 ++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index e34bd958c9..a96243d1bf 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -10,32 +10,34 @@ inherit native QT_MODULE = "qtbase" -EXTRA_OECONF = "-prefix ${prefix} \ - -L ${STAGING_LIBDIR_NATIVE} \ - -I ${STAGING_INCDIR_NATIVE} \ - -system-zlib \ - -no-libjpeg \ - -no-libpng \ - -no-gif \ - -no-accessibility \ - -no-cups \ - -no-nis \ - -no-gui \ - -no-qml-debug \ - -no-sql-mysql \ - -no-sql-sqlite \ - -no-opengl \ - -no-openssl \ - -verbose -release \ - -headerdir ${includedir}/qt5 \ - -no-glib \ - -no-iconv \ - -no-fast \ - -silent \ - -nomake examples \ - -nomake tests \ - -nomake demos \ - -no-rpath \ +EXTRA_OECONF = " \ + -prefix ${prefix} \ + -L ${STAGING_LIBDIR_NATIVE} \ + -I ${STAGING_INCDIR_NATIVE} \ + -system-zlib \ + -no-libjpeg \ + -no-libpng \ + -no-gif \ + -no-accessibility \ + -no-cups \ + -no-nis \ + -no-gui \ + -no-qml-debug \ + -no-sql-mysql \ + -no-sql-sqlite \ + -no-opengl \ + -no-openssl \ + -qt-xcb \ + -verbose -release \ + -headerdir ${includedir}/qt5 \ + -no-glib \ + -no-iconv \ + -no-fast \ + -silent \ + -nomake examples \ + -nomake tests \ + -nomake demos \ + -no-rpath \ " do_configure() { From 95e49bf0f426e1f4bb063fb8fb4166d393333817 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 18 Nov 2012 18:02:52 +0100 Subject: [PATCH 012/347] qt5: split QT_CONFIG_FLAGS to more separate variables Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 47 +++++++++++++++++++++++++++++++++------ recipes-qt/qt5/qtbase.inc | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 5035ad08e2..12d5de2f63 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -18,12 +18,50 @@ require qt5_arch.inc QT_MODULE ?= "${PN}" -QT_CONFIG_FLAGS ?= "" +QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" +QT_DISTRO_FLAGS_linuxstdbase = "-sm" +# Some can be used only for certain QT_MODULEs, so define them here, +# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc +QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" +QT_GLFLAGS ?= "" +QT_QT3SUPPORT ?= "-qt3support" +QT_XML ?= "-xmlpatterns" +QT_WEBKIT ?= "-webkit" +QT_PHONON ?= "-phonon" +QT_DBUS ?= "-qdbus" +QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" +QT_MODULE_FLAGS ?= "" +QT_NAS ?= "-no-nas-sound" +QT_NIS ?= "-no-nis" +QT_CUPS ?= "-no-cups" +QT_STL ?= "-stl" +QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" QT_TESTS ?= "-nomake tests" QT_EXAMPLES ?= "-nomake examples" QT_DEMOS ?= "-nomake demos" +QT_CONFIG_FLAGS += " \ + -release \ + -reduce-relocations \ + -shared \ + -silent \ + -glib \ + -no-pch \ + -no-rpath \ + -no-fast \ + ${QT_SYSTEM_LIBS} \ + ${QT_NIS} \ + ${QT_CUPS} \ + ${QT_SQL_DRIVER_FLAGS} \ + ${QT_DISTRO_FLAGS} \ + ${QT_MODULE_FLAGS} \ + ${QT_GLFLAGS} \ + ${QT_TESTS} \ + ${QT_EXAMPLES} \ + ${QT_DEMOS} \ +" + EXTRA_OEMAKE = "-e" @@ -60,14 +98,9 @@ do_configure() { -importdir ${libdir}/${QT_DIR_NAME}/imports \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ - -shared \ - -no-rpath \ -platform build-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ - ${QT_TESTS} \ - ${QT_EXAMPLES} \ - ${QT_DEMOS} \ - ${QT_CONFIG_FLAGS} -no-fast + ${QT_CONFIG_FLAGS} } do_compile() { diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 235029b0aa..b328fed771 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -10,6 +10,8 @@ SRC_URI += " \ # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms" +QT_MODULE_FLAGS ?= "-system-xcb" + INC_PR = "r0" QT_BASE_NAME = "qt5" From 5bd1456605d1f876b027baaf178664c784966493 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 19 Nov 2012 10:41:57 -0200 Subject: [PATCH 013/347] qtbase: Drop unused patch for setting qt.conf override support Signed-off-by: Otavio Salvador --- recipes-qt/qt5/qtbase.inc | 1 - ...ow-to-set-qt.conf-from-the-outside-u.patch | 44 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b328fed771..f9684908f0 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -5,7 +5,6 @@ SRC_URI += " \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ " -#file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms" diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index 6b5bed9a2c..0000000000 --- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d5a0cf45ebbd6a5911f8bd208fe355eb990b5388 Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH] 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 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index ccf0718..497e72e 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -49,6 +49,8 @@ - QT_BEGIN_NAMESPACE - extern QString qt_libraryInfoFile(); - QT_END_NAMESPACE -+#include -+#include - #elif defined(QT_BOOTSTRAPPED) - QString qt_libraryInfoFile() - { -@@ -142,6 +143,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - #ifdef QT_BOOTSTRAPPED - if(!QFile::exists(qtconfig)) - qtconfig = qt_libraryInfoFile(); -+ if (!QFile::exists(qtconfig)) { -+ QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = QFile::decodeName(config); -+ printf("using qt.conf %s", qtconfig.toLatin1().data()); -+ } - #else - if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { - #ifdef Q_OS_MAC --- -1.7.4.1 - From bb72ea51a11b04d33ddc58ca4e251e575cac9cbd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 19 Nov 2012 17:25:59 -0200 Subject: [PATCH 014/347] qtbase: Replace patch to allow specification of qt.conf file This patch has been cleaned to the minimum version and is ready for sending to upstream. Once it is accepted, a backport of the final version will be included here. Signed-off-by: Otavio Salvador --- recipes-qt/qt5/qtbase.inc | 2 +- ...owing-the-customization-of-the-paths.patch | 37 ------------------- ...ow-the-specification-of-where-to-loa.patch | 33 +++++++++++++++++ 3 files changed, 34 insertions(+), 38 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch create mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f9684908f0..115bb46993 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,7 +1,7 @@ require qt5.inc SRC_URI += " \ - file://0001-Allowing-the-customization-of-the-paths.patch \ + file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ " diff --git a/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch b/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch deleted file mode 100644 index 073df37872..0000000000 --- a/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 183cf66e2770f7fbc420cf7aa94a9a8564785044 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Wed, 7 Nov 2012 14:48:46 -0800 -Subject: [PATCH] Allowing the customization of the paths - -Signed-off-by: Mikko Levonmaa ---- - src/corelib/global/qlibraryinfo.cpp | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index ccf0718..487b8eb 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -49,6 +49,7 @@ - QT_BEGIN_NAMESPACE - extern QString qt_libraryInfoFile(); - QT_END_NAMESPACE -+#include - #elif defined(QT_BOOTSTRAPPED) - QString qt_libraryInfoFile() - { -@@ -164,6 +165,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - } - #endif -+ if (!QFile::exists(qtconfig)) { -+ QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = QFile::decodeName(config); -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); -+ } - if (QFile::exists(qtconfig)) - return new QSettings(qtconfig, QSettings::IniFormat); - return 0; //no luck --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch new file mode 100644 index 0000000000..f72bccd49d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch @@ -0,0 +1,33 @@ +From 4dcf1eeaa1742435027ad0cb2a218e7e9b776011 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Mon, 19 Nov 2012 10:19:52 -0200 +Subject: [PATCH] qlibraryinfo: Allow the specification of where to load + qt.conf + +This is important to allow cross toolchains to work out of box. + +This patch was based on an existent patch in OpenEmbedded. + +Change-Id: Idc4feee95a9961db02752d88da9cfe360e89f8e3 +--- + src/corelib/global/qlibraryinfo.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index a756577..0c92e12 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -164,6 +164,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + } + #endif ++ if (!QFile::exists(qtconfig)) { ++ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); ++ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); ++ } + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + return 0; //no luck +-- +1.7.10.4 + From ead13659cac1002194c016c2109e9695a53fc2a8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 19 Nov 2012 17:27:34 -0200 Subject: [PATCH 015/347] qt5-native: Allow override of qt.conf path Signed-off-by: Otavio Salvador --- recipes-qt/qt5/qt5-native.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index a96243d1bf..0585afc295 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -10,6 +10,12 @@ inherit native QT_MODULE = "qtbase" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" + +SRC_URI += " \ + file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ +" + EXTRA_OECONF = " \ -prefix ${prefix} \ -L ${STAGING_LIBDIR_NATIVE} \ From 05d88f867da93cf726806b8271f64f06f5c69569 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Mon, 3 Dec 2012 11:11:58 -0800 Subject: [PATCH 016/347] qt5-native: Always compile and install uic Signed-off-by: Mikko Levonmaa --- .../qt5/files/0001-Always-build-uic.patch | 31 +++++++++++++++++++ recipes-qt/qt5/qt5-native.inc | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/files/0001-Always-build-uic.patch diff --git a/recipes-qt/qt5/files/0001-Always-build-uic.patch b/recipes-qt/qt5/files/0001-Always-build-uic.patch new file mode 100644 index 0000000000..3f2e3fd925 --- /dev/null +++ b/recipes-qt/qt5/files/0001-Always-build-uic.patch @@ -0,0 +1,31 @@ +From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] 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. + +Signed-off-by: Mikko Levonmaa +--- + src/tools/tools.pro | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/tools.pro b/src/tools/tools.pro +index c67d6bf..b6f3b39 100644 +--- a/src/tools/tools.pro ++++ b/src/tools/tools.pro +@@ -1,8 +1,8 @@ + TEMPLATE = subdirs + +-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc ++TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic + contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml +-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic ++ + # Set subdir and respective target name + src_tools_bootstrap.subdir = $$PWD/bootstrap + src_tools_bootstrap.target = sub-tools-bootstrap +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 0585afc295..226979e413 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -14,6 +14,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" SRC_URI += " \ file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ + file://0001-Always-build-uic.patch \ " EXTRA_OECONF = " \ @@ -55,7 +56,7 @@ do_configure() { do_install() { install -d ${D}${bindir}/ - for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt; do + for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt uic; do install -v -m 0755 bin/${i} ${D}${bindir}/${i} done install -d ${D}${datadir}/qt5/ From cba28bbc10627e70de53c146271e0d4b0e9324dc Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Mon, 3 Dec 2012 11:14:35 -0800 Subject: [PATCH 017/347] qtbase: use the correct tools from the native sysroot Signed-off-by: Mikko Levonmaa --- classes/qmake5.bbclass | 2 +- classes/qmake5_base.bbclass | 2 +- recipes-qt/qt5/qt5.inc | 26 +++++++++++++++++++++++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index b30b150720..0cde707aab 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,7 +6,7 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qt5-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" +#export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index fc90429fd5..5601bb9478 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -21,7 +21,7 @@ Prefix = Binaries = ${STAGING_BINDIR_NATIVE} Headers = ${STAGING_INCDIR}/qt5 Plugins = ${STAGING_LIBDIR}/qt5/plugins/ -Libraries = ${STAGING_LIBDIR}/qt5-test +Libraries = ${STAGING_LIBDIR} Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/ HostData = ${STAGING_DATADIR_NATIVE}/qt5 HostBinaries = ${STAGING_BINDIR_NATIVE}/ diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 12d5de2f63..b9e223b719 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -62,8 +62,13 @@ QT_CONFIG_FLAGS += " \ ${QT_DEMOS} \ " +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -d -after \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc" UIC="${STAGING_BINDIR_NATIVE}/uic" MAKE="make -e"' -EXTRA_OEMAKE = "-e" +export QT_CONF_PATH="${S}/qt.conf" do_configure() { set_endian @@ -85,6 +90,21 @@ do_configure() { ## FIXME, the file nameing is dumb... cp ${WORKDIR}/qmake-build.conf.sh mkspecs/build-oe-g++/qmake.conf + #export QT_CONF_PATH="${S}/qt.conf" + + echo "[Paths]" > $QT_CONF_PATH + #echo "Prefix=${prefix}" >> $QT_CONF_PATH + echo "Binaries=${bindir}" >> $QT_CONF_PATH + echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Libraries=${libdir}" >> $QT_CONF_PATH + echo "Plugins=${libdir}/qt5/plugins" >> $QT_CONF_PATH + echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH + echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH + echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH + echo "HostData=${S}" >> $QT_CONF_PATH + ./configure -v \ -opensource -confirm-license \ -prefix ${prefix} \ @@ -98,7 +118,7 @@ do_configure() { -importdir ${libdir}/${QT_DIR_NAME}/imports \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ - -platform build-oe-g++ \ + -platform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ ${QT_CONFIG_FLAGS} } @@ -108,7 +128,7 @@ do_compile() { export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" - oe_runmake + oe_runmake ${EXTRA_ENV} } do_install() { From c3e8e8de5931e8aac14f6555237e53b1e32502e9 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Thu, 29 Nov 2012 08:45:54 -0800 Subject: [PATCH 018/347] qt5-native: mkspecs are now installed correctly Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5-native.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 226979e413..0231c0f6b0 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -37,6 +37,7 @@ EXTRA_OECONF = " \ -qt-xcb \ -verbose -release \ -headerdir ${includedir}/qt5 \ + -datadir ${datadir}/qt5 \ -no-glib \ -no-iconv \ -no-fast \ From ff173560e260798e7ed50b9e6cef3d41e8349609 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Sun, 2 Dec 2012 10:04:53 -0800 Subject: [PATCH 019/347] qtbase: partially resolves module pri installation The pri files get correctly placed under the work dir, but fail to stage correctly. Also there are some packaging issues Signed-off-by: Mikko Levonmaa --- classes/qmake5.bbclass | 2 +- recipes-qt/qt5/files/g++.conf | 2 +- recipes-qt/qt5/files/linux.conf | 10 ++++++- recipes-qt/qt5/qt5-native.inc | 3 +-- recipes-qt/qt5/qt5.inc | 47 +++++++++++++++++++++++---------- recipes-qt/qt5/qtbase.inc | 6 ++--- 6 files changed, 47 insertions(+), 23 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 0cde707aab..b30b150720 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,7 +6,7 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qt5-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -#export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" diff --git a/recipes-qt/qt5/files/g++.conf b/recipes-qt/qt5/files/g++.conf index e58fb15718..14cd3e1d77 100644 --- a/recipes-qt/qt5/files/g++.conf +++ b/recipes-qt/qt5/files/g++.conf @@ -18,7 +18,7 @@ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTP QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS $(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 diff --git a/recipes-qt/qt5/files/linux.conf b/recipes-qt/qt5/files/linux.conf index 86703813ca..08e84f2362 100644 --- a/recipes-qt/qt5/files/linux.conf +++ b/recipes-qt/qt5/files/linux.conf @@ -22,7 +22,6 @@ QMAKE_LIBDIR_EGL = QMAKE_INCDIR_OPENVG = QMAKE_LIBDIR_OPENVG = - QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) @@ -35,6 +34,15 @@ QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread +QMAKE_LIBS_LIBUDEV = -ludev + +QMAKE_CFLAGS_WAYLAND = +QMAKE_INCDIR_WAYLAND = +QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client +QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server +QMAKE_LIBDIR_WAYLAND = +QMAKE_DEFINES_WAYLAND = +QMAKE_WAYLAND_SCANNER = wayland-scanner QMAKE_MOC = $(OE_QMAKE_MOC) QMAKE_UIC = $(OE_QMAKE_UIC) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 0231c0f6b0..3fde774a76 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -38,6 +38,7 @@ EXTRA_OECONF = " \ -verbose -release \ -headerdir ${includedir}/qt5 \ -datadir ${datadir}/qt5 \ + -docdir ${docdir}/qt5 \ -no-glib \ -no-iconv \ -no-fast \ @@ -62,6 +63,4 @@ do_install() { done install -d ${D}${datadir}/qt5/ cp -PfR mkspecs ${D}${datadir}/qt5/ - cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt5/mkspecs/common/g++-unix.conf - cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt5/mkspecs/common/ } diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b9e223b719..195717fc93 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -25,7 +25,6 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm" # but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" QT_GLFLAGS ?= "" -QT_QT3SUPPORT ?= "-qt3support" QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" QT_PHONON ?= "-phonon" @@ -50,6 +49,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -no-fast \ + -pkg-config \ ${QT_SYSTEM_LIBS} \ ${QT_NIS} \ ${QT_CUPS} \ @@ -84,26 +84,18 @@ do_configure() { cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf - mkdir -p mkspecs/build-oe-g++ - cp -f ${WORKDIR}/qplatformdefs.h mkspecs/build-oe-g++ - - ## FIXME, the file nameing is dumb... - cp ${WORKDIR}/qmake-build.conf.sh mkspecs/build-oe-g++/qmake.conf - - #export QT_CONF_PATH="${S}/qt.conf" - echo "[Paths]" > $QT_CONF_PATH - #echo "Prefix=${prefix}" >> $QT_CONF_PATH echo "Binaries=${bindir}" >> $QT_CONF_PATH echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Libraries=${libdir}" >> $QT_CONF_PATH - echo "Plugins=${libdir}/qt5/plugins" >> $QT_CONF_PATH + echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH - echo "HostData=${S}" >> $QT_CONF_PATH + echo "HostData=${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}" >> $QT_CONF_PATH ./configure -v \ -opensource -confirm-license \ @@ -121,21 +113,48 @@ do_configure() { -platform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ ${QT_CONFIG_FLAGS} + + ### Since we are utilizing the native tree for the mkspecs, update the target mkspecs there + if [ ! -e ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then + cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ + fi + ### qmodule.pri and qconfig.pri contain target specific stuff + cp -f mkspecs/qmodule.pri ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/qmodule.pri + cp -f mkspecs/qconfig.pri ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/qconfig.pri } do_compile() { unset CFLAGS CXXFLAGS AR - export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" - oe_runmake ${EXTRA_ENV} + + # Build qmake for the target arch + cd ${S}/qmake + ${OE_QMAKE_QMAKE} + oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S} } do_install() { oe_runmake install INSTALL_ROOT=${D} + + # Fix up the binaries to the right location + install -d ${D}${bindir}/ + mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ + rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ + + # Install the right arch qmake + rm ${D}/${bindir}/qmake + install -m 0755 bin/qmake2 ${D}${bindir}/qmake } FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" +FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/platforms/*.so" +FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/platforms/.debug/*.so" + FILES_${PN}-dev = "${libdir}/cmake/* ${libdir}/pkgconfig/*.pc ${libdir}/*.la ${libdir}/*.prl ${includedir}/qt5/*" FILES_${PN}-staticdev = "${libdir}/libQt*.a" +FILES_${PN}-tools = "${bindir}/qmake" +FILES_${PN}-mkspecs = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/*" +FILES_${PN}-doc = "${STAGING_DATADIR_NATIVE}/doc/*" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 115bb46993..e85ff6e175 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -6,8 +6,8 @@ SRC_URI += " \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ " -# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h -DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms" +# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h +DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" QT_MODULE_FLAGS ?= "-system-xcb" @@ -16,8 +16,6 @@ INC_PR = "r0" QT_BASE_NAME = "qt5" QT_DIR_NAME = "qt5" -export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" - # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" From 2dd5038560a0f37eb418d1b868eeddf1d60d1fe0 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Mon, 3 Dec 2012 08:55:40 -0800 Subject: [PATCH 020/347] Preserve the PARALLEL_MAKE value when compiling Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 195717fc93..9f29792c49 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -66,7 +66,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -d -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc" UIC="${STAGING_BINDIR_NATIVE}/uic" MAKE="make -e"' + MOC="${STAGING_BINDIR_NATIVE}/moc" UIC="${STAGING_BINDIR_NATIVE}/uic" MAKE="make -e ${PARALLEL_MAKE}"' export QT_CONF_PATH="${S}/qt.conf" From 93fc33ea280a2fd060dc35b6d60e3d6a65968ccf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Dec 2012 01:25:15 +0100 Subject: [PATCH 021/347] qt5-native: explicitly disable xcb * otherwise we need for -system-xcb libxcb-native libxau-native libxdmcp-native xcb-util-wm-native xcb-util-image-native xcb-util-keysyms-native or for -qt-xcb libxcb-native libxau-native libxdmcp-native and fix underlinking in xcb linking test (QMAKE_LIBS_XCB) | linking xcb | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXau.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link) | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXdmcp.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link) | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauDisposeAuth' | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauGetBestAuthByAddr' | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XdmcpWrap' Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 3fde774a76..040b6439e9 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -34,7 +34,7 @@ EXTRA_OECONF = " \ -no-sql-sqlite \ -no-opengl \ -no-openssl \ - -qt-xcb \ + -no-xcb \ -verbose -release \ -headerdir ${includedir}/qt5 \ -datadir ${datadir}/qt5 \ From 17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 16:32:32 -0800 Subject: [PATCH 022/347] qtbase: mkspecs are now staged correctly They are placed under STAGING_DATADIR as they need to be kept separate from the native side. The reason for doing so is that some qt modules require native tools and the mkspecs in STAGING_DATADIR_NATIVE cannot be polluted with the target mkspecs There are still some packaging issues Signed-off-by: Mikko Levonmaa --- classes/qmake5.bbclass | 2 +- classes/qmake5_base.bbclass | 3 +- recipes-qt/qt5/qt5-native.inc | 1 + recipes-qt/qt5/qt5.inc | 27 +++++++++------- .../0001-Always-build-uic.patch | 0 ...-qt.conf-override-when-bootstrapping.patch | 31 +++++++++++++++++++ 6 files changed, 49 insertions(+), 15 deletions(-) rename recipes-qt/qt5/{files => qtbase}/0001-Always-build-uic.patch (100%) create mode 100644 recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index b30b150720..180cedcfc1 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,7 +6,7 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qt5-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export QMAKESPEC = "${STAGING_DATADIR_NATIVE}/qt5/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 5601bb9478..7012d0d741 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -22,8 +22,7 @@ Binaries = ${STAGING_BINDIR_NATIVE} Headers = ${STAGING_INCDIR}/qt5 Plugins = ${STAGING_LIBDIR}/qt5/plugins/ Libraries = ${STAGING_LIBDIR} -Mkspecs = ${STAGING_DATADIR}/qt5/mkspecs/ -HostData = ${STAGING_DATADIR_NATIVE}/qt5 +HostData = ${STAGING_DATADIR}/qt5 HostBinaries = ${STAGING_BINDIR_NATIVE}/ EOF } diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 040b6439e9..11cfcff03a 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -14,6 +14,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" SRC_URI += " \ file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ + file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ file://0001-Always-build-uic.patch \ " diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 9f29792c49..af933dea0b 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -84,6 +84,9 @@ do_configure() { cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf + mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} + cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs + echo "[Paths]" > $QT_CONF_PATH echo "Binaries=${bindir}" >> $QT_CONF_PATH echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH @@ -95,7 +98,7 @@ do_configure() { echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH - echo "HostData=${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH ./configure -v \ -opensource -confirm-license \ @@ -114,13 +117,13 @@ do_configure() { -xplatform ${TARGET_OS}-oe-g++ \ ${QT_CONFIG_FLAGS} - ### Since we are utilizing the native tree for the mkspecs, update the target mkspecs there - if [ ! -e ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then - cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ + ### Since we are pointing our host data we need to get them there before compile + if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then + cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ fi - ### qmodule.pri and qconfig.pri contain target specific stuff - cp -f mkspecs/qmodule.pri ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/qmodule.pri - cp -f mkspecs/qconfig.pri ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/qconfig.pri + ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well + cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri + cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri } do_compile() { @@ -150,11 +153,11 @@ do_install() { FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" -FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/platforms/*.so" -FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/platforms/.debug/*.so" +FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/platforms/*" +FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/platforms/.debug/*" FILES_${PN}-dev = "${libdir}/cmake/* ${libdir}/pkgconfig/*.pc ${libdir}/*.la ${libdir}/*.prl ${includedir}/qt5/*" FILES_${PN}-staticdev = "${libdir}/libQt*.a" -FILES_${PN}-tools = "${bindir}/qmake" -FILES_${PN}-mkspecs = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs/*" -FILES_${PN}-doc = "${STAGING_DATADIR_NATIVE}/doc/*" +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}-mkspecs = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*" +FILES_${PN}-doc = "${STAGING_DATADIR}/doc/*" diff --git a/recipes-qt/qt5/files/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch similarity index 100% rename from recipes-qt/qt5/files/0001-Always-build-uic.patch rename to recipes-qt/qt5/qtbase/0001-Always-build-uic.patch diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch new file mode 100644 index 0000000000..6c9affae6c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch @@ -0,0 +1,31 @@ +From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 15:32:33 -0800 +Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + qmake/option.cpp | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/qmake/option.cpp b/qmake/option.cpp +index 91c154a..a4f3a85 100644 +--- a/qmake/option.cpp ++++ b/qmake/option.cpp +@@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) + + QString qt_libraryInfoFile() + { ++ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); ++ if (QFile::exists(qtconfig)) { ++ printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data()); ++ return qtconfig; ++ } + if (!Option::globals->qmake_abslocation.isEmpty()) + return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); + return QString(); +-- +1.7.4.1 + From b514c5d67a259457383db532151a4bf6f482d158 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 5 Dec 2012 13:50:46 -0800 Subject: [PATCH 023/347] Updated QT_CONF_PATH default values in qmake5_base This allows the subsequent modules to install correctly. Also during do_configure we stage target specific file into the staging area and modify some prf files inorder to make the module (qt_lib_.pri) files install correctly Signed-off-by: Mikko Levonmaa --- classes/qmake5_base.bbclass | 12 ++++++------ recipes-qt/qt5/qt5.inc | 38 ++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 7012d0d741..014d46183a 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -17,13 +17,13 @@ do_generate_qt_config_file() { export QT_CONF_PATH=${WORKDIR}/qt.conf cat > ${WORKDIR}/qt.conf < mkspecs/${TARGET_OS}-oe-g++/qmake.conf + ### This copying needs to take place every time as the installation will + ### change.. CHECK THIS mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} - cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs + cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ + ### Make sure that modules are installed correctly + sed -i '/pritarget/s/HOST_DATA/INSTALL_DATA/' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf + rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* + rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri + + ### This will make sure that our mkspecs wil leventually end up in STAGING_DATADIR + ### Consider doing this as a patch!! + sed -i '/mkspecs\.path/s/HOST_DATA/INSTALL_DATA/' qtbase.pro + sed -i '/pritarget/s/HOST_DATA/INSTALL_DATA/' mkspecs/features/qt_installs.prf echo "[Paths]" > $QT_CONF_PATH echo "Binaries=${bindir}" >> $QT_CONF_PATH @@ -101,6 +112,7 @@ do_configure() { echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH ./configure -v \ + -dont-process \ -opensource -confirm-license \ -prefix ${prefix} \ -bindir ${bindir} \ @@ -124,9 +136,14 @@ do_configure() { ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri + + ### As we provided the '-dont-process' switch inorder to allow us to stage a few files + ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) + ${OE_QMAKE_QMAKE} -r -d } do_compile() { + unset CFLAGS CXXFLAGS AR oe_runmake ${EXTRA_ENV} @@ -141,7 +158,8 @@ do_compile() { do_install() { oe_runmake install INSTALL_ROOT=${D} - # Fix up the binaries to the right location + ### Fix up the binaries to the right location + ### TODO: FIX install -d ${D}${bindir}/ mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ @@ -153,11 +171,17 @@ do_install() { FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" -FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/platforms/*" -FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/platforms/.debug/*" +FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*" +FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/.debug/*" -FILES_${PN}-dev = "${libdir}/cmake/* ${libdir}/pkgconfig/*.pc ${libdir}/*.la ${libdir}/*.prl ${includedir}/qt5/*" +FILES_${PN}-dev = " \ + ${libdir}/cmake/* \ + ${libdir}/pkgconfig/*.pc \ + ${libdir}/*.la \ + ${libdir}/*.prl \ + ${includedir}/qt5/* \ + ${datadir}/qt5/* \ +" FILES_${PN}-staticdev = "${libdir}/libQt*.a" FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}-mkspecs = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*" -FILES_${PN}-doc = "${STAGING_DATADIR}/doc/*" +FILES_${PN}-doc = "${datadir}/doc/*" From a45a6a184fcacf3a6ba15f4b38e5988b83f4c30f Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 12:06:06 -0800 Subject: [PATCH 024/347] qtjsbackend: Initial recipe Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtjsbackend-native.inc | 34 ++++++++++++++++ .../qt5/qtjsbackend-native_4.999+git.bb | 7 ++++ recipes-qt/qt5/qtjsbackend.inc | 40 +++++++++++++++++++ ...mkv8snapshot-tool-to-the-native-side.patch | 32 +++++++++++++++ ...hat-we-pick-up-the-mkv8snapshot-tool.patch | 30 ++++++++++++++ recipes-qt/qt5/qtjsbackend/qmake.conf | 1 + recipes-qt/qt5/qtjsbackend_4.999+git.bb | 7 ++++ 7 files changed, 151 insertions(+) create mode 100644 recipes-qt/qt5/qtjsbackend-native.inc create mode 100644 recipes-qt/qt5/qtjsbackend-native_4.999+git.bb create mode 100644 recipes-qt/qt5/qtjsbackend.inc create mode 100644 recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch create mode 100644 recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch create mode 100644 recipes-qt/qt5/qtjsbackend/qmake.conf create mode 100644 recipes-qt/qt5/qtjsbackend_4.999+git.bb diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc new file mode 100644 index 0000000000..0158dd6541 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -0,0 +1,34 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" + +DEPENDS = "qt5-native" + +INC_PR = "r0" + +inherit native + +#FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtjsbacked:" + +SRC_URI += "\ + file://qmake.conf \ + file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ + " + +# Bitbake will not respect the make order set by qmake and at times it will try to compile +# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail +PARALLEL_MAKE = "" + +do_configure() { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + # This should not be needed. Perhaps the lack of this file is an indication + # of an error on the native recipe... + cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + + ${STAGING_BINDIR_NATIVE}/qmake -d +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb new file mode 100644 index 0000000000..93a9be000f --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -0,0 +1,7 @@ +SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" +S = "${WORKDIR}/git" + +require qtjsbackend-native.inc + +PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc new file mode 100644 index 0000000000..aebbc1f7f4 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -0,0 +1,40 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" + +DEPENDS = "qtbase" + +INC_PR = "r0" + +inherit qmake5 + +SRC_URI += " \ + file://qmake.conf \ + file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ + " + +# Bitbake will not respect the make order set by qmake and at times it will try to compile +# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail +PARALLEL_MAKE = "" + +export QT_CONF_PATH="${WORKDIR}/qt.conf" + +do_configure () { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + # This should not be needed. Perhaps the lack of this file is an indication + # of an error on the native recipe... + cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + + ${OE_QMAKE_QMAKE} -d +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +FILES_${PN}-dev += "\ + ${STAGING_INCDIR}/qt5 \ + ${STAGING_DATADIR}/qt5 \ + ${libdir}/*.prl \ +" diff --git a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch new file mode 100644 index 0000000000..556ece1470 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From d962ede7b874be21af636e07205cbb3866d82b27 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 11:20:13 -0800 +Subject: [PATCH] Install the mkv8snapshot tool to the native side + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro +index 16beb02..5e327f7 100644 +--- a/src/tools/mkv8snapshot/mkv8snapshot.pro ++++ b/src/tools/mkv8snapshot/mkv8snapshot.pro +@@ -24,5 +24,10 @@ unix:LIBS += -lpthread + + # We don't need to install this tool, it's only used for building v8. + # However we do have to make sure that 'make install' builds it. +-dummytarget.CONFIG = dummy_install +-INSTALLS += dummytarget ++#dummytarget.CONFIG = dummy_install ++#INSTALLS += dummytarget ++ ++# Install the tool so that during target cross compilation we have access to the native side binary ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target ++ +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch new file mode 100644 index 0000000000..8ec57ebac2 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch @@ -0,0 +1,30 @@ +From 3e07a136f42db68390cb9e20f5476e896f3bcd63 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 11:25:22 -0800 +Subject: [PATCH 2/2] Make sure that we pick up the mkv8snapshot tool + from the native sysroot + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + src/v8/v8.pro | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/v8/v8.pro b/src/v8/v8.pro +index 2be6a19..2478e5f 100644 +--- a/src/v8/v8.pro ++++ b/src/v8/v8.pro +@@ -25,7 +25,8 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. + include(v8.pri) + + contains(QT_CONFIG, v8snapshot) { +- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} ++ #mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} ++ mkv8snapshot.commands = mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} + DUMMY_FILE = v8.pro + mkv8snapshot.input = DUMMY_FILE + mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtjsbackend/qmake.conf b/recipes-qt/qt5/qtjsbackend/qmake.conf new file mode 100644 index 0000000000..42ba8e45fb --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb new file mode 100644 index 0000000000..2e83249a7d --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -0,0 +1,7 @@ +SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" +S = "${WORKDIR}/git" + +require qtjsbackend.inc + +PR = "${INC_PR}.0" From 18b6ac18c7c0b0eb27c658be14c6b2c4d5c5bc71 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 7 Dec 2012 08:45:43 -0800 Subject: [PATCH 025/347] qtjsbackend: fixed packaging Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtjsbackend.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index aebbc1f7f4..8b8374b5c0 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -26,7 +26,7 @@ do_configure () { # of an error on the native recipe... cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf - ${OE_QMAKE_QMAKE} -d + ${OE_QMAKE_QMAKE} -r -d } do_install() { @@ -34,7 +34,7 @@ do_install() { } FILES_${PN}-dev += "\ - ${STAGING_INCDIR}/qt5 \ - ${STAGING_DATADIR}/qt5 \ + ${incdir}/qt5/* \ + ${datadir}/qt5/* \ ${libdir}/*.prl \ " From 16e4143ba5765f96d68cffbbf6a1a06491e71011 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 7 Dec 2012 08:57:03 -0800 Subject: [PATCH 026/347] qtdeclarative: Initial recipe Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/files/module_qmake.conf | 1 + recipes-qt/qt5/qtdeclarative.inc | 39 +++++++++++++++++++++++ recipes-qt/qt5/qtdeclarative_4.999+git.bb | 7 ++++ 3 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/files/module_qmake.conf create mode 100644 recipes-qt/qt5/qtdeclarative.inc create mode 100644 recipes-qt/qt5/qtdeclarative_4.999+git.bb diff --git a/recipes-qt/qt5/files/module_qmake.conf b/recipes-qt/qt5/files/module_qmake.conf new file mode 100644 index 0000000000..4285ae84b6 --- /dev/null +++ b/recipes-qt/qt5/files/module_qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) \ No newline at end of file diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc new file mode 100644 index 0000000000..aaada23e8c --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -0,0 +1,39 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" + +DEPENDS = "qtbase qtjsbackend" + +INC_PR = "r0" + +inherit qmake5 + +SRC_URI += " \ + file://module_qmake.conf \ + " + +# Bitbake will not respect the make order set by qmake and at times it will try to compile +# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail +#PARALLEL_MAKE = "" + +export QT_CONF_PATH="${WORKDIR}/qt.conf" + +do_configure () { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + # This should not be needed. Perhaps the lack of this file is an indication + # of an error on the native recipe... + cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf + + ${OE_QMAKE_QMAKE} -d +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +FILES_${PN}-dev += "\ + ${STAGING_INCDIR}/qt5 \ + ${STAGING_DATADIR}/qt5 \ + ${libdir}/*.prl \ +" diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb new file mode 100644 index 0000000000..456c2dab1a --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -0,0 +1,7 @@ +SRCREV = "90ac5018823ab1109d084cbe0e9e63a4cd531faa" +SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git" +S = "${WORKDIR}/git" + +require qtdeclarative.inc + +PR = "${INC_PR}.0" From 5dc4d0616a4dd00dfaaafe37317cb606a3e3863d Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Sun, 9 Dec 2012 13:45:11 -0800 Subject: [PATCH 027/347] qt5-native, qtbase: Git version is preferred Atleast until qt5 is offciall released. Also updated git SHAs Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc | 2 ++ recipes-qt/qt5/qt5-4.999+git.inc | 4 +--- recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb | 2 ++ recipes-qt/qt5/qt5-native_4.999+git.bb | 2 +- recipes-qt/qt5/qtbase_4.999+git.bb | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc index a0bc754d9a..40318444d2 100644 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc +++ b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc @@ -10,6 +10,8 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" +DEFAULT_PREFERENCE = "-1" + LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 2d5bd2b971..4804789c7e 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -9,9 +9,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-beta2+gitr${SRCPV}" - -DEFAULT_PREFERENCE = "-1" +PV = "4.999+5.0.0-beta2+git-r${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb index 5891541417..21e51e583f 100644 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb +++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb @@ -3,5 +3,7 @@ require qt5-${PV}.inc PR = "${INC_PR}.0" +DEFAULT_PREFERENCE = "-1" + SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb index b6072fa3a1..ae6df1ca0c 100644 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9" +SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb index fe8fd1e571..0477df2474 100644 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9" +SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" \ No newline at end of file From bd6c9c28c2aa789a7f906a7ffb5bc2c18cc77884 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Sun, 9 Dec 2012 13:48:29 -0800 Subject: [PATCH 028/347] qtbase: fix installations Created new variables OE_CROSS_INSTALL_DATA and OE_CROSS_HOST_DATA to support the installation and configuration of qtbase and dependant modules. Added paths for Qml2Imports Signed-off-by: Mikko Levonmaa --- classes/qmake5_base.bbclass | 15 ++++++++------- recipes-qt/qt5/qt5.inc | 29 +++++++++++++++++++---------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 014d46183a..09cb3ea535 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -14,21 +14,22 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link," STRIP[unexport] = "1" do_generate_qt_config_file() { - export QT_CONF_PATH=${WORKDIR}/qt.conf - cat > ${WORKDIR}/qt.conf < ${WORKDIR}/qt.conf < mkspecs/${TARGET_OS}-oe-g++/qmake.conf - ### This copying needs to take place every time as the installation will - ### change.. CHECK THIS + ### Stage the base mkspecs so that 'HostData' will find them mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ - ### Make sure that modules are installed correctly - sed -i '/pritarget/s/HOST_DATA/INSTALL_DATA/' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf + ### Make sure that modules are installed correctly. During configure they will pick this one + ### instead of the one from ${S}/mkspecs... + sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' \ + ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* + + ### Remove the old pri files rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri - ### This will make sure that our mkspecs wil leventually end up in STAGING_DATADIR - ### Consider doing this as a patch!! - sed -i '/mkspecs\.path/s/HOST_DATA/INSTALL_DATA/' qtbase.pro - sed -i '/pritarget/s/HOST_DATA/INSTALL_DATA/' mkspecs/features/qt_installs.prf echo "[Paths]" > $QT_CONF_PATH echo "Binaries=${bindir}" >> $QT_CONF_PATH @@ -109,7 +118,7 @@ do_configure() { echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH - echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH ./configure -v \ -dont-process \ @@ -129,7 +138,7 @@ do_configure() { -xplatform ${TARGET_OS}-oe-g++ \ ${QT_CONFIG_FLAGS} - ### Since we are pointing our host data we need to get them there before compile + ### Since we are pointing our host data we need to get them there before compilation if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ fi From 14f60829d8e3df70327b51e729fc68f833a5e333 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Sun, 9 Dec 2012 13:53:29 -0800 Subject: [PATCH 029/347] qtjsbackend: SHA bump Also uses the same qmake.conf as other modules Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtjsbackend-native.inc | 2 -- recipes-qt/qt5/qtjsbackend-native_4.999+git.bb | 3 ++- recipes-qt/qt5/qtjsbackend.inc | 4 ++-- recipes-qt/qt5/qtjsbackend/qmake.conf | 1 - recipes-qt/qt5/qtjsbackend_4.999+git.bb | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 recipes-qt/qt5/qtjsbackend/qmake.conf diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 0158dd6541..7595e53d5b 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -7,8 +7,6 @@ INC_PR = "r0" inherit native -#FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtjsbacked:" - SRC_URI += "\ file://qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb index 93a9be000f..54dd21a76d 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -1,5 +1,6 @@ -SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" + S = "${WORKDIR}/git" require qtjsbackend-native.inc diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 8b8374b5c0..c9a5db913f 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -8,7 +8,7 @@ INC_PR = "r0" inherit qmake5 SRC_URI += " \ - file://qmake.conf \ + file://module_qmake.conf \ file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ " @@ -24,7 +24,7 @@ do_configure () { # This should not be needed. Perhaps the lack of this file is an indication # of an error on the native recipe... - cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf ${OE_QMAKE_QMAKE} -r -d } diff --git a/recipes-qt/qt5/qtjsbackend/qmake.conf b/recipes-qt/qt5/qtjsbackend/qmake.conf deleted file mode 100644 index 42ba8e45fb..0000000000 --- a/recipes-qt/qt5/qtjsbackend/qmake.conf +++ /dev/null @@ -1 +0,0 @@ -load(qt_build_config) diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb index 2e83249a7d..de19fb3182 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -1,4 +1,4 @@ -SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" S = "${WORKDIR}/git" From 9f3d14a2fca85f99f2b7bb881e4be736fe266685 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Sun, 9 Dec 2012 13:56:34 -0800 Subject: [PATCH 030/347] qtdeclarative: packaging update and recipe cleanup Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtdeclarative.inc | 22 ++++++++++++++-------- recipes-qt/qt5/qtdeclarative_4.999+git.bb | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index aaada23e8c..bf904753cb 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -11,10 +11,6 @@ SRC_URI += " \ file://module_qmake.conf \ " -# Bitbake will not respect the make order set by qmake and at times it will try to compile -# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail -#PARALLEL_MAKE = "" - export QT_CONF_PATH="${WORKDIR}/qt.conf" do_configure () { @@ -25,15 +21,25 @@ do_configure () { # of an error on the native recipe... cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf - ${OE_QMAKE_QMAKE} -d + ${OE_QMAKE_QMAKE} -r -d } do_install() { oe_runmake install INSTALL_ROOT=${D} } -FILES_${PN}-dev += "\ - ${STAGING_INCDIR}/qt5 \ - ${STAGING_DATADIR}/qt5 \ +FILES_${PN}-dev = "\ + ${includedir}/qt5/* \ + ${datadir}/qt5/mkspecs/* \ ${libdir}/*.prl \ + ${libdir}/cmake/* \ + ${libdir}/pkgconfig/*.pc \ " + +FILES_${PN}-staticdev = "${libdir}/*.la" +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" +FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" +FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" + +PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" \ No newline at end of file diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb index 456c2dab1a..8551d74c4c 100644 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -1,4 +1,4 @@ -SRCREV = "90ac5018823ab1109d084cbe0e9e63a4cd531faa" +SRCREV = "425260c2b2a60c0c145a5e76a3b7835eadd0fd0d" SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git" S = "${WORKDIR}/git" From c460ac223b342b1e90f99e1237ffcef5f2e78474 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Dec 2012 01:29:51 +0100 Subject: [PATCH 031/347] qt5-native-4.999+git: bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native_4.999+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb index ae6df1ca0c..9fbff86967 100644 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" +SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" From 436fab1083651affc93c5455c4d60869ad0e8621 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Dec 2012 02:25:40 +0100 Subject: [PATCH 032/347] qtbase-4.999+git: bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_4.999+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb index 0477df2474..b7bacbd08b 100644 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" \ No newline at end of file +SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" From d6c825767cff12f810324b6b520d45da58b81e4f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:20:18 +0100 Subject: [PATCH 033/347] qt5-4.999+git.inc: fix PV format Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 4804789c7e..6d703509c7 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -9,7 +9,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-beta2+git-r${SRCPV}" +PV = "4.999+5.0.0-beta2+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ From 0879ad08aa48d384576ef5a7b98b3a0dadae19dc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:23:19 +0100 Subject: [PATCH 034/347] qtbase, qt5-native: upgrade to 5.0.0-rc1 Signed-off-by: Martin Jansa --- ...qt5-4.999+5.0.0-beta2.inc => qt5-4.999+5.0.0-rc1.inc} | 4 ++-- recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb | 9 --------- recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb | 9 +++++++++ recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb | 7 ------- recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb | 7 +++++++ 5 files changed, 18 insertions(+), 18 deletions(-) rename recipes-qt/qt5/{qt5-4.999+5.0.0-beta2.inc => qt5-4.999+5.0.0-rc1.inc} (80%) delete mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb create mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb create mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc similarity index 80% rename from recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc rename to recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc index 40318444d2..5815fd2bb2 100644 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc +++ b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc @@ -1,9 +1,9 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. -QT_VERSION ?= "5.0.0-beta2" +QT_VERSION ?= "5.0.0-rc1" SRC_URI += " \ - http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ file://linux.conf \ file://g++.conf \ " diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb deleted file mode 100644 index 21e51e583f..0000000000 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qt5-native.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" -SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb new file mode 100644 index 0000000000..e08e48b6b4 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb @@ -0,0 +1,9 @@ +require qt5-native.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" +SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb deleted file mode 100644 index 2639d12b0f..0000000000 --- a/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qtbase.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" -SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb new file mode 100644 index 0000000000..83ab2a916e --- /dev/null +++ b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb @@ -0,0 +1,7 @@ +require qtbase.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" +SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" From ccb4d199df02ee706d7b5944724fffa434643c8c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:24:03 +0100 Subject: [PATCH 035/347] qt5-4.999+git.inc: update PV for SRCREVs after 5.0.0-rc1 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 6d703509c7..099cba85c2 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -9,7 +9,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-beta2+git${SRCPV}" +PV = "4.999+5.0.0-rc1+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ From 458e15b19ec257b2d4853e90c87ce1581c07637a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:29:23 +0100 Subject: [PATCH 036/347] qtdeclarative: LIC_FILES_CHKSUM should be in source, not COMMON_LICENSE_DIR Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index bf904753cb..c526a00a08 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,3 +1,4 @@ +# FIXME!!! LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" @@ -42,4 +43,4 @@ FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" -PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" \ No newline at end of file +PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" From a52f36a63cd03e5f17e1e2d1a9776870c6f3c1f9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:31:06 +0100 Subject: [PATCH 037/347] qtdeclarative_4.999+git: use common structure and bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative_4.999+git.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb index 8551d74c4c..f0680fc76f 100644 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -1,7 +1,6 @@ -SRCREV = "425260c2b2a60c0c145a5e76a3b7835eadd0fd0d" -SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git" -S = "${WORKDIR}/git" - require qtdeclarative.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "a6065d60f158ffad7a94877883af69731da94295" From b7cdb5428d2d73f2614227f8a4abebf06f446bae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:35:26 +0100 Subject: [PATCH 038/347] qtjsbackend_4.999+git: use common structure and bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native_4.999+git.bb | 8 +++----- recipes-qt/qt5/qtjsbackend_4.999+git.bb | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb index 54dd21a76d..bbf4930de0 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -1,8 +1,6 @@ -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" -SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" - -S = "${WORKDIR}/git" - require qtjsbackend-native.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb index de19fb3182..c75b6d92e0 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -1,7 +1,6 @@ -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" -SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" -S = "${WORKDIR}/git" - require qtjsbackend.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" From ffc2911bcec031836a1c003dcb1506b765a9bf35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:37:10 +0100 Subject: [PATCH 039/347] qtjsbackend: fix SRC_URI formatting Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native.inc | 2 +- recipes-qt/qt5/qtjsbackend.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 7595e53d5b..db70fd1153 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -10,7 +10,7 @@ inherit native SRC_URI += "\ file://qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ - " +" # Bitbake will not respect the make order set by qmake and at times it will try to compile # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index c9a5db913f..1249493b87 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -9,8 +9,8 @@ inherit qmake5 SRC_URI += " \ file://module_qmake.conf \ - file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ - " + file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ +" # Bitbake will not respect the make order set by qmake and at times it will try to compile # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail From 921546e3288330c027154c2b671bf893fff9d293 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 01:14:51 +0100 Subject: [PATCH 040/347] qtdeclarative: fix typo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index c526a00a08..29f28a717e 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -43,4 +43,4 @@ FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" -PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" +PACKAGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" From bfe100c179c69d3b66cd74c5f3a4aa493cc49b15 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 11 Dec 2012 14:42:35 -0800 Subject: [PATCH 041/347] qtjsbackend: fix native dependency Also fixes the broken qtjsbackent-native recipe Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- recipes-qt/qt5/qtdeclarative.inc | 2 ++ recipes-qt/qt5/qtjsbackend-native.inc | 26 +++++++++++++++++++++++--- recipes-qt/qt5/qtjsbackend.inc | 4 +++- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 099cba85c2..437dc3be40 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" PV = "4.999+5.0.0-rc1+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 29f28a717e..b36b46adf2 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -6,6 +6,8 @@ DEPENDS = "qtbase qtjsbackend" INC_PR = "r0" +QT_MODULE = "${PN}" + inherit qmake5 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index db70fd1153..8a66229a48 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -3,12 +3,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe DEPENDS = "qt5-native" +QT_MODULE = "qtjsbackend" + INC_PR = "r0" inherit native SRC_URI += "\ - file://qmake.conf \ + file://module_qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " @@ -16,15 +18,33 @@ SRC_URI += "\ # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail PARALLEL_MAKE = "" +export QT_CONF_PATH="${WORKDIR}/qt.conf" + do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD + cat > ${WORKDIR}/qt.conf < Date: Wed, 12 Dec 2012 06:09:18 +0100 Subject: [PATCH 042/347] qtbase: disable xcb Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index e85ff6e175..628e767afc 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -7,9 +7,12 @@ SRC_URI += " \ " # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h -DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" +# DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" +# reenable when we switch to "-qt-xcb" and build of +# src/platformsupport/glxconvenience/ is resolved to be before build of +# src/plugins/platforms/xcb/ -QT_MODULE_FLAGS ?= "-system-xcb" +QT_MODULE_FLAGS = "-no-xcb" INC_PR = "r0" From 97f4709e4c5e3facea506cde3c98a4175c01be63 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 06:19:48 +0100 Subject: [PATCH 043/347] qt5: move qtbase specific stuff from qt5.inc to qtbase.inc * qt5.inc should be used by all qtmodule.inc * add missing PACKAGES in qt5.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 95 +------------------------------------- recipes-qt/qt5/qtbase.inc | 97 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 93 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index ef4dbd3664..3ba352cb6a 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -2,12 +2,6 @@ inherit qmake5_base -SRC_URI += " \ - file://qmake-build.conf.sh \ - file://qmake.conf.sh \ - file://qplatformdefs.h \ -" - # Qt5 is dependent on icu for localization ICU = "icu " ICU_powerpc = "pango" @@ -16,7 +10,7 @@ DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl gli require qt5_arch.inc -QT_MODULE ?= "${PN}" +QT_MODULE ?= "${BPN}" QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" QT_DISTRO_FLAGS_linuxstdbase = "-sm" @@ -79,76 +73,6 @@ do_configure() { # Avoid problems with the linkers, since we want the linker to be g++ unset LD - - ### Make sure that our mkspecs will eventually end up in STAGING_DATADIR - ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_DATA ${datadir}/${QT_DIR_NAME} - sed -i '/mkspecs\.path/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' qtbase.pro - sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' mkspecs/features/qt_installs.prf - - ### Same applies to the module headers... - ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_HEADERS ${includedir}/${QT_DIR_NAME} - sed -i 's/QT_INSTALL_HEADERS/OE_CROSS_INSTALL_HEADERS/g' mkspecs/features/qt_installs.prf - - ### Create the mkspec for the target - mkdir -p mkspecs/${TARGET_OS}-oe-g++ - cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ - bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf - - ### Stage the base mkspecs so that 'HostData' will find them - mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} - cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ - ### Make sure that modules are installed correctly. During configure they will pick this one - ### instead of the one from ${S}/mkspecs... - sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' \ - ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf - rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* - - ### Remove the old pri files - rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri - - - echo "[Paths]" > $QT_CONF_PATH - echo "Binaries=${bindir}" >> $QT_CONF_PATH - echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Libraries=${libdir}" >> $QT_CONF_PATH - echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH - echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH - echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH - echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH - echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH - - ./configure -v \ - -dont-process \ - -opensource -confirm-license \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -datadir ${datadir}/${QT_DIR_NAME} \ - -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ - -docdir ${docdir}/${QT_DIR_NAME} \ - -headerdir ${includedir}/${QT_DIR_NAME} \ - -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ - -importdir ${libdir}/${QT_DIR_NAME}/imports \ - -translationdir ${datadir}/${QT_DIR_NAME}/translations \ - -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ - -platform ${TARGET_OS}-oe-g++ \ - -xplatform ${TARGET_OS}-oe-g++ \ - ${QT_CONFIG_FLAGS} - - ### Since we are pointing our host data we need to get them there before compilation - if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then - cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ - fi - ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well - cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri - cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri - - ### As we provided the '-dont-process' switch inorder to allow us to stage a few files - ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) - ${OE_QMAKE_QMAKE} -r -d } do_compile() { @@ -156,28 +80,13 @@ do_compile() { unset CFLAGS CXXFLAGS AR oe_runmake ${EXTRA_ENV} - - # Build qmake for the target arch - cd ${S}/qmake - ${OE_QMAKE_QMAKE} - oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S} } do_install() { oe_runmake install INSTALL_ROOT=${D} - - ### Fix up the binaries to the right location - ### TODO: FIX - install -d ${D}${bindir}/ - mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ - rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ - - # Install the right arch qmake - rm ${D}/${bindir}/qmake - install -m 0755 bin/qmake2 ${D}${bindir}/qmake } +PACKAGES .= "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg" FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 628e767afc..1130ab6808 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -4,8 +4,13 @@ SRC_URI += " \ file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ + file://qmake-build.conf.sh \ + file://qmake.conf.sh \ + file://qplatformdefs.h \ " +DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" + # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" # reenable when we switch to "-qt-xcb" and build of @@ -23,3 +28,95 @@ QT_DIR_NAME = "qt5" ARM_INSTRUCTION_SET = "arm" inherit qmake5 + +do_configure_append() { + ### Make sure that our mkspecs will eventually end up in STAGING_DATADIR + ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_DATA ${datadir}/${QT_DIR_NAME} + sed -i '/mkspecs\.path/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' qtbase.pro + sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' mkspecs/features/qt_installs.prf + + ### Same applies to the module headers... + ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_HEADERS ${includedir}/${QT_DIR_NAME} + sed -i 's/QT_INSTALL_HEADERS/OE_CROSS_INSTALL_HEADERS/g' mkspecs/features/qt_installs.prf + + ### Create the mkspec for the target + mkdir -p mkspecs/${TARGET_OS}-oe-g++ + cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ + bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf + + ### Stage the base mkspecs so that 'HostData' will find them + mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} + cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ + ### Make sure that modules are installed correctly. During configure they will pick this one + ### instead of the one from ${S}/mkspecs... + sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' \ + ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf + rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* + + ### Remove the old pri files + rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri + + + echo "[Paths]" > $QT_CONF_PATH + echo "Binaries=${bindir}" >> $QT_CONF_PATH + echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Libraries=${libdir}" >> $QT_CONF_PATH + echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH + echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH + echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH + echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH + echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH + + ./configure -v \ + -dont-process \ + -opensource -confirm-license \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -datadir ${datadir}/${QT_DIR_NAME} \ + -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ + -docdir ${docdir}/${QT_DIR_NAME} \ + -headerdir ${includedir}/${QT_DIR_NAME} \ + -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ + -importdir ${libdir}/${QT_DIR_NAME}/imports \ + -translationdir ${datadir}/${QT_DIR_NAME}/translations \ + -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -platform ${TARGET_OS}-oe-g++ \ + -xplatform ${TARGET_OS}-oe-g++ \ + ${QT_CONFIG_FLAGS} + + ### Since we are pointing our host data we need to get them there before compilation + if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then + cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ + fi + ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well + cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri + cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri + + ### As we provided the '-dont-process' switch inorder to allow us to stage a few files + ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) + ${OE_QMAKE_QMAKE} -r -d +} + +do_compile_append() { + # Build qmake for the target arch + cd ${S}/qmake + ${OE_QMAKE_QMAKE} + oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S} +} + +do_install_append() { + ### Fix up the binaries to the right location + ### TODO: FIX + install -d ${D}${bindir}/ + mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ + rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ + + # Install the right arch qmake + rm ${D}/${bindir}/qmake + install -m 0755 bin/qmake2 ${D}${bindir}/qmake +} From 0ff97f9e6a959216c164d728cad7962a2a2909e2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 06:29:34 +0100 Subject: [PATCH 044/347] qtdeclarative: use common qt5.inc, fix invalid PACKAGES Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index b36b46adf2..db944be647 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,3 +1,5 @@ +require qt5.inc + # FIXME!!! LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" @@ -6,8 +8,6 @@ DEPENDS = "qtbase qtjsbackend" INC_PR = "r0" -QT_MODULE = "${PN}" - inherit qmake5 SRC_URI += " \ @@ -31,18 +31,8 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -FILES_${PN}-dev = "\ - ${includedir}/qt5/* \ - ${datadir}/qt5/mkspecs/* \ - ${libdir}/*.prl \ - ${libdir}/cmake/* \ - ${libdir}/pkgconfig/*.pc \ -" - -FILES_${PN}-staticdev = "${libdir}/*.la" -FILES_${PN}-tools = "${bindir}/*" FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" -PACKAGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" +PACKAGES .= "${PN}-qmlplugins ${PN}-qmltooling ${PN}-qmltooling-dbg" From 20091a9f08c82d101ae730d682c402f80a97a4fc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 06:30:04 +0100 Subject: [PATCH 045/347] qtjsbackend: use common qt5.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index ebc0fc0997..3da6cc76ac 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -1,10 +1,11 @@ +require qt5.inc + +# FIXME!!! LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" DEPENDS = "qtbase qtjsbackend-native" -QT_MODULE = "${PN}" - INC_PR = "r0" inherit qmake5 @@ -30,13 +31,3 @@ do_configure () { ${OE_QMAKE_QMAKE} -r -d } - -do_install() { - oe_runmake install INSTALL_ROOT=${D} -} - -FILES_${PN}-dev += "\ - ${incdir}/qt5/* \ - ${datadir}/qt5/* \ - ${libdir}/*.prl \ -" From 7b3138f3690f626faa179cbe1597c0e1cf649a36 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 18:39:01 +0100 Subject: [PATCH 046/347] qt5: use lastest SRCREV in stable branches * master branches were removed today and old SRCREVs are invalid now Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+git.inc | 8 ++++---- recipes-qt/qt5/qt5-native_4.999+git.bb | 2 +- recipes-qt/qt5/qtbase_4.999+git.bb | 2 +- recipes-qt/qt5/qtdeclarative_4.999+git.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_4.999+git.bb | 2 +- recipes-qt/qt5/qtjsbackend_4.999+git.bb | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 437dc3be40..0dcaa62409 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -2,7 +2,7 @@ # each module needs to define valid SRCREV SRC_URI += " \ - git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git \ + git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \ file://linux.conf \ file://g++.conf \ " @@ -13,6 +13,6 @@ PV = "4.999+5.0.0-rc1+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb index 9fbff86967..d2b5b03169 100644 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" +SRCREV = "22c234a34e8af6a26b374ef810630ba9e82c696a" diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb index b7bacbd08b..5c282846fa 100644 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" +SRCREV = "22c234a34e8af6a26b374ef810630ba9e82c696a" diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb index f0680fc76f..a7a6699859 100644 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "a6065d60f158ffad7a94877883af69731da94295" +SRCREV = "ce97fe0fc482f2fda72583544e3436508f73417e" diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb index bbf4930de0..ae14124710 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb index c75b6d92e0..b5ef96d56d 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" +SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" From 6b7dd87f920794cbe11e657bb6a053bd24763372 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 19:11:06 +0100 Subject: [PATCH 047/347] qt5: fixup FILES_ entries * some are not needed as they are included in default value Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 16 +++++----------- recipes-qt/qt5/qtbase.inc | 3 +++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 3ba352cb6a..9356788139 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -86,20 +86,14 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -PACKAGES .= "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg" -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" -FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*" -FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/.debug/*" +PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg " +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}" +FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*" -FILES_${PN}-dev = " \ +FILES_${PN}-dev += " \ ${libdir}/cmake/* \ - ${libdir}/pkgconfig/*.pc \ - ${libdir}/*.la \ ${libdir}/*.prl \ ${includedir}/qt5/* \ ${datadir}/qt5/* \ " -FILES_${PN}-staticdev = "${libdir}/libQt*.a" -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}-doc = "${datadir}/doc/*" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 1130ab6808..52c95a3a7e 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -120,3 +120,6 @@ do_install_append() { rm ${D}/${bindir}/qmake install -m 0755 bin/qmake2 ${D}${bindir}/qmake } + +PACKAGES =. "${PN}-fonts " +FILES_${PN}-fonts = "${libdir}/fonts" From b93420ad8f6383fc93648cfdf59bafc3e4a6a9a5 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 14 Dec 2012 16:39:59 -0800 Subject: [PATCH 048/347] qtbase: fix up prl and pkgconfig file generation Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtbase.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 52c95a3a7e..2784465f9c 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -53,6 +53,11 @@ do_configure_append() { ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* + ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib + ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR} + sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf + sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf + ### Remove the old pri files rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri From 34d4955894fae96d56e0b3831cd295b399230df2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 14 Dec 2012 16:46:41 -0800 Subject: [PATCH 049/347] qmake5: library path correction in generated qt.conf Signed-off-by: Mikko Levonmaa --- classes/qmake5_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 09cb3ea535..ee5ff7800b 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -21,7 +21,7 @@ do_generate_qt_config_file() { Binaries = ${bindir} Headers = ${STAGING_INCDIR}/qt5 Plugins = ${libdir}/qt5/plugins -Libraries = ${libdir} +Libraries = ${STAGING_LIBDIR} Imports = ${datadir}/qt5/imports Qml2Imports = ${libdir}/qt5/qml Documentation=${docdir}/qt5 From 6a07d6efce4c14960c592e92e20200b335ad1fa4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 17 Dec 2012 20:33:02 +0100 Subject: [PATCH 050/347] qtbase, qtdeclarative: bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native_4.999+git.bb | 2 +- recipes-qt/qt5/qtbase_4.999+git.bb | 2 +- recipes-qt/qt5/qtdeclarative_4.999+git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb index d2b5b03169..71403729c5 100644 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "22c234a34e8af6a26b374ef810630ba9e82c696a" +SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb index 5c282846fa..09991cad42 100644 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "22c234a34e8af6a26b374ef810630ba9e82c696a" +SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb index a7a6699859..e934f3d4cc 100644 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "ce97fe0fc482f2fda72583544e3436508f73417e" +SRCREV = "27f0e91d6d24a5b871c79946323e3ee32f4a276c" From 1ecc46ac42a685057c94e1bd30147ea81ab925bf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Dec 2012 17:53:14 +0100 Subject: [PATCH 051/347] qtbase: don't touch STAGING_DATADIR Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2784465f9c..4b39791719 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -56,7 +56,6 @@ do_configure_append() { ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR} sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf - sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf ### Remove the old pri files rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri From 597f9bf624f81dd63358158fe656b8d7984cab07 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Dec 2012 19:15:51 +0100 Subject: [PATCH 052/347] qt5: upgrade recipes to use 5.0.0 tarballs * and change DEFAULT_PREFERRENCE for git recipes negative again * bump SRCREV in git recipes to latest and update PV Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc | 19 ------------------- .../{qt5-4.999+git.inc => qt5-5.0.0+git.inc} | 4 +++- recipes-qt/qt5/qt5-5.0.0.inc | 17 +++++++++++++++++ recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb | 9 --------- recipes-qt/qt5/qt5-native_4.999+git.bb | 6 ------ recipes-qt/qt5/qt5-native_5.0.0+git.bb | 8 ++++++++ recipes-qt/qt5/qt5-native_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb | 7 ------- recipes-qt/qt5/qtbase_4.999+git.bb | 6 ------ recipes-qt/qt5/qtbase_5.0.0+git.bb | 6 ++++++ recipes-qt/qt5/qtbase_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtdeclarative_4.999+git.bb | 6 ------ recipes-qt/qt5/qtdeclarative_5.0.0+git.bb | 6 ++++++ recipes-qt/qt5/qtdeclarative_5.0.0.bb | 7 +++++++ ...git.bb => qtjsbackend-native_5.0.0+git.bb} | 4 ++-- recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 7 +++++++ ..._4.999+git.bb => qtjsbackend_5.0.0+git.bb} | 4 ++-- recipes-qt/qt5/qtjsbackend_5.0.0.bb | 7 +++++++ 18 files changed, 79 insertions(+), 58 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc rename recipes-qt/qt5/{qt5-4.999+git.inc => qt5-5.0.0+git.inc} (92%) create mode 100644 recipes-qt/qt5/qt5-5.0.0.inc delete mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qt5-native_4.999+git.bb create mode 100644 recipes-qt/qt5/qt5-native_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+git.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_4.999+git.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0.bb rename recipes-qt/qt5/{qtjsbackend_4.999+git.bb => qtjsbackend-native_5.0.0+git.bb} (59%) create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0.bb rename recipes-qt/qt5/{qtjsbackend-native_4.999+git.bb => qtjsbackend_5.0.0+git.bb} (56%) create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0.bb diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc deleted file mode 100644 index 5815fd2bb2..0000000000 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. - -QT_VERSION ?= "5.0.0-rc1" - -SRC_URI += " \ - http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ - file://linux.conf \ - file://g++.conf \ -" - -S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" - -DEFAULT_PREFERENCE = "-1" - -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc similarity index 92% rename from recipes-qt/qt5/qt5-4.999+git.inc rename to recipes-qt/qt5/qt5-5.0.0+git.inc index 0dcaa62409..9f2e2f3172 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-5.0.0+git.inc @@ -9,7 +9,9 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-rc1+git${SRCPV}" +PV = "5.0.0+git${SRCPV}" + +DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc new file mode 100644 index 0000000000..4bdfaeed54 --- /dev/null +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -0,0 +1,17 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +QT_VERSION ?= "${PV}" + +SRC_URI += " \ + http://releases.qt-project.org/qt5/${QT_VERSION}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + file://linux.conf \ + file://g++.conf \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb deleted file mode 100644 index e08e48b6b4..0000000000 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qt5-native.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" -SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb deleted file mode 100644 index 71403729c5..0000000000 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-native.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/recipes-qt/qt5/qt5-native_5.0.0+git.bb new file mode 100644 index 0000000000..e99971fb32 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0+git.bb @@ -0,0 +1,8 @@ +require qt5-native.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb new file mode 100644 index 0000000000..d9c922d608 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb deleted file mode 100644 index 83ab2a916e..0000000000 --- a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qtbase.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" -SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb deleted file mode 100644 index 09991cad42..0000000000 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qtbase.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qtbase_5.0.0+git.bb b/recipes-qt/qt5/qtbase_5.0.0+git.bb new file mode 100644 index 0000000000..f5f010a321 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb new file mode 100644 index 0000000000..d9c922d608 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb deleted file mode 100644 index e934f3d4cc..0000000000 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qtdeclarative.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "27f0e91d6d24a5b871c79946323e3ee32f4a276c" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb new file mode 100644 index 0000000000..0ba6becd66 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "c8ef32e2b6cded37a6854b94a281464c1b7a298b" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb new file mode 100644 index 0000000000..fb37cb8760 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" +SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb similarity index 59% rename from recipes-qt/qt5/qtjsbackend_4.999+git.bb rename to recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb index b5ef96d56d..48e2654e3b 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb @@ -1,5 +1,5 @@ -require qtjsbackend.inc -require qt5-4.999+git.inc +require ${PN}.inc +require qt5-5.0.0+git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb similarity index 56% rename from recipes-qt/qt5/qtjsbackend-native_4.999+git.bb rename to recipes-qt/qt5/qtjsbackend_5.0.0+git.bb index ae14124710..48e2654e3b 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb @@ -1,5 +1,5 @@ -require qtjsbackend-native.inc -require qt5-4.999+git.inc +require ${PN}.inc +require qt5-5.0.0+git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" From 319a61802d4d5fb971693f3df1e69450e7bbab8a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Dec 2012 16:40:13 +0100 Subject: [PATCH 053/347] qt5: remove unused qmake-build.conf.sh Signed-off-by: Martin Jansa --- recipes-qt/qt5/files/qmake-build.conf.sh | 31 ------------------------ recipes-qt/qt5/qtbase.inc | 1 - 2 files changed, 32 deletions(-) delete mode 100644 recipes-qt/qt5/files/qmake-build.conf.sh diff --git a/recipes-qt/qt5/files/qmake-build.conf.sh b/recipes-qt/qt5/files/qmake-build.conf.sh deleted file mode 100644 index f09433a1ba..0000000000 --- a/recipes-qt/qt5/files/qmake-build.conf.sh +++ /dev/null @@ -1,31 +0,0 @@ -#cat < Date: Thu, 27 Dec 2012 16:43:59 +0100 Subject: [PATCH 054/347] qt5: move module specific files to own directories Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 2 +- .../qt5/{qtbase => qt5-native}/0001-Always-build-uic.patch | 0 .../0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch | 0 recipes-qt/qt5/{files => qtbase}/qmake.conf.sh | 0 recipes-qt/qt5/{files => qtbase}/qplatformdefs.h | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename recipes-qt/qt5/{qtbase => qt5-native}/0001-Always-build-uic.patch (100%) rename recipes-qt/qt5/{qtbase => qt5-native}/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch (100%) rename recipes-qt/qt5/{files => qtbase}/qmake.conf.sh (100%) rename recipes-qt/qt5/{files => qtbase}/qplatformdefs.h (100%) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 11cfcff03a..392508fa6f 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -10,7 +10,7 @@ inherit native QT_MODULE = "qtbase" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:" SRC_URI += " \ file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch similarity index 100% rename from recipes-qt/qt5/qtbase/0001-Always-build-uic.patch rename to recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch similarity index 100% rename from recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch rename to recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch diff --git a/recipes-qt/qt5/files/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh similarity index 100% rename from recipes-qt/qt5/files/qmake.conf.sh rename to recipes-qt/qt5/qtbase/qmake.conf.sh diff --git a/recipes-qt/qt5/files/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h similarity index 100% rename from recipes-qt/qt5/files/qplatformdefs.h rename to recipes-qt/qt5/qtbase/qplatformdefs.h From a812c654dbf9df088ab9a06a890e49d39bd7d6a6 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 18 Dec 2012 12:14:40 -0800 Subject: [PATCH 055/347] qt5-native: Getting rid of printf statements in qmake They will cause the building of cmake-native to fail as it will parse the output of qmake -query and is not expecting to find the added lines in the output Signed-off-by: Mikko Levonmaa --- ...0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch | 3 +-- ...-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch index 6c9affae6c..1b294fd2f9 100644 --- a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch +++ b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch @@ -14,13 +14,12 @@ diff --git a/qmake/option.cpp b/qmake/option.cpp index 91c154a..a4f3a85 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp -@@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) +@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) QString qt_libraryInfoFile() { + QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); + if (QFile::exists(qtconfig)) { -+ printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data()); + return qtconfig; + } if (!Option::globals->qmake_abslocation.isEmpty()) diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch index f72bccd49d..10219ec990 100644 --- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch @@ -17,13 +17,12 @@ diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryin index a756577..0c92e12 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -164,6 +164,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() +@@ -164,6 +164,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() } } #endif + if (!QFile::exists(qtconfig)) { + qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); + } if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); From a376cc61ed00eccd0892936d101a1ecece0e6f3c Mon Sep 17 00:00:00 2001 From: Eric Blade Date: Sun, 17 Feb 2013 09:59:58 +0100 Subject: [PATCH 056/347] qt5: upgrade to 5.0.1 Signed-off-by: Martin Jansa --- recipes-qt/qt5/{qt5-5.0.0.inc => qt5-5.0.1.inc} | 0 recipes-qt/qt5/qt5-native.inc | 1 - recipes-qt/qt5/qt5-native_5.0.0.bb | 7 ------- recipes-qt/qt5/qt5-native_5.0.1.bb | 7 +++++++ recipes-qt/qt5/qt5.inc | 1 - recipes-qt/qt5/qtbase_5.0.0.bb | 7 ------- recipes-qt/qt5/qtbase_5.0.1.bb | 7 +++++++ recipes-qt/qt5/qtdeclarative_5.0.0.bb | 7 ------- recipes-qt/qt5/qtdeclarative_5.0.1.bb | 7 +++++++ recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 7 ------- recipes-qt/qt5/qtjsbackend-native_5.0.1.bb | 7 +++++++ recipes-qt/qt5/qtjsbackend_5.0.0.bb | 7 ------- recipes-qt/qt5/qtjsbackend_5.0.1.bb | 7 +++++++ 13 files changed, 35 insertions(+), 37 deletions(-) rename recipes-qt/qt5/{qt5-5.0.0.inc => qt5-5.0.1.inc} (100%) delete mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb create mode 100644 recipes-qt/qt5/qt5-native_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtbase_5.0.0.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.1.bb diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.1.inc similarity index 100% rename from recipes-qt/qt5/qt5-5.0.0.inc rename to recipes-qt/qt5/qt5-5.0.1.inc diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 392508fa6f..1aa5c0cec6 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -42,7 +42,6 @@ EXTRA_OECONF = " \ -docdir ${docdir}/qt5 \ -no-glib \ -no-iconv \ - -no-fast \ -silent \ -nomake examples \ -nomake tests \ diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb deleted file mode 100644 index d9c922d608..0000000000 --- a/recipes-qt/qt5/qt5-native_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" -SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qt5-native_5.0.1.bb b/recipes-qt/qt5/qt5-native_5.0.1.bb new file mode 100644 index 0000000000..f822a3e30d --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" +SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 9356788139..e9b87a0b98 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -42,7 +42,6 @@ QT_CONFIG_FLAGS += " \ -glib \ -no-pch \ -no-rpath \ - -no-fast \ -pkg-config \ ${QT_SYSTEM_LIBS} \ ${QT_NIS} \ diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb deleted file mode 100644 index d9c922d608..0000000000 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" -SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb new file mode 100644 index 0000000000..f822a3e30d --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" +SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb deleted file mode 100644 index fb37cb8760..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" -SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb new file mode 100644 index 0000000000..99471681a4 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78" +SRC_URI[sha256sum] = "fa7c6941626ff4a40419f9be286f478b0461ac57f4a058035b3e1a9043dfee85" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb deleted file mode 100644 index a6b77fd6b8..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" -SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb new file mode 100644 index 0000000000..3b64f8814d --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" +SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb deleted file mode 100644 index a6b77fd6b8..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" -SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb new file mode 100644 index 0000000000..3b64f8814d --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" +SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a" From 5d5ba83cc6eadbff6d60d5ae4947bc9b48d846f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 Feb 2013 20:56:51 +0100 Subject: [PATCH 057/347] qt5-native: rename to qtbase-native to avoid confusion * we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what * drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 2 +- recipes-qt/qt5/qt5.inc | 2 +- recipes-qt/qt5/{qt5-native.inc => qtbase-native.inc} | 3 --- ...0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch | 0 .../{qt5-native_5.0.0+git.bb => qtbase-native_5.0.0+git.bb} | 2 +- recipes-qt/qt5/{qt5-native_5.0.1.bb => qtbase-native_5.0.1.bb} | 2 ++ recipes-qt/qt5/qtbase.inc | 2 +- .../qt5/{qt5-native => qtbase}/0001-Always-build-uic.patch | 0 recipes-qt/qt5/qtjsbackend-native.inc | 2 +- 9 files changed, 7 insertions(+), 8 deletions(-) rename recipes-qt/qt5/{qt5-native.inc => qtbase-native.inc} (93%) rename recipes-qt/qt5/{qt5-native => qtbase-native}/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch (100%) rename recipes-qt/qt5/{qt5-native_5.0.0+git.bb => qtbase-native_5.0.0+git.bb} (84%) rename recipes-qt/qt5/{qt5-native_5.0.1.bb => qtbase-native_5.0.1.bb} (80%) rename recipes-qt/qt5/{qt5-native => qtbase}/0001-Always-build-uic.patch (100%) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 180cedcfc1..00d6c0eaec 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -3,7 +3,7 @@ # inherit qmake5_base -QT5TOOLSDEPENDS ?= "qt5-native " +QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e9b87a0b98..97f3ee17e8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -6,7 +6,7 @@ inherit qmake5_base ICU = "icu " ICU_powerpc = "pango" -DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" +DEPENDS += "virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" require qt5_arch.inc diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qtbase-native.inc similarity index 93% rename from recipes-qt/qt5/qt5-native.inc rename to recipes-qt/qt5/qtbase-native.inc index 1aa5c0cec6..db1292cd38 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -2,7 +2,6 @@ DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" DEPENDS = "zlib-native dbus-native" SECTION = "libs" HOMEPAGE = "http://qt-project.org" -PROVIDES = "qt5-tools-native" INC_PR = "r0" @@ -10,8 +9,6 @@ inherit native QT_MODULE = "qtbase" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:" - SRC_URI += " \ file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ diff --git a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch similarity index 100% rename from recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch rename to recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch diff --git a/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/recipes-qt/qt5/qtbase-native_5.0.0+git.bb similarity index 84% rename from recipes-qt/qt5/qt5-native_5.0.0+git.bb rename to recipes-qt/qt5/qtbase-native_5.0.0+git.bb index e99971fb32..80d805656d 100644 --- a/recipes-qt/qt5/qt5-native_5.0.0+git.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.0+git.bb @@ -1,4 +1,4 @@ -require qt5-native.inc +require ${PN}.inc require qt5-5.0.0+git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qt5-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb similarity index 80% rename from recipes-qt/qt5/qt5-native_5.0.1.bb rename to recipes-qt/qt5/qtbase-native_5.0.1.bb index f822a3e30d..f5d961305a 100644 --- a/recipes-qt/qt5/qt5-native_5.0.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb @@ -3,5 +3,7 @@ require qt5-${PV}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0001-Always-build-uic.patch" + SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2b14de1e44..f420d37ad0 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -8,7 +8,7 @@ SRC_URI += " \ file://qplatformdefs.h \ " -DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" +DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" diff --git a/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch similarity index 100% rename from recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch rename to recipes-qt/qt5/qtbase/0001-Always-build-uic.patch diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 8a66229a48..37e2b80d9e 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -1,7 +1,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" -DEPENDS = "qt5-native" +DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" From 70b1b233b20c4128cd068c35244c1a97934edf1d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 27 Feb 2013 21:26:09 +0100 Subject: [PATCH 058/347] qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or absolute sysroot * fix paralel build * default make does good job, cleans mkspecs, installs all headers and libs needed for qtjsbackend-native * move native tools to QT_DIR_NAME prefix, this way qt4 and qt5 can be staged at the same time * only variables referencing WORKDIR are now QMAKE_PRL_BUILD_DIR ./x86_64-linux/usr/lib/libQt5Network.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/network/ ./x86_64-linux/usr/lib/libQt5Xml.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/xml/ ./x86_64-linux/usr/lib/libQt5Bootstrap.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/tools/bootstrap/ ./x86_64-linux/usr/lib/libQt5Concurrent.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/concurrent/ ./x86_64-linux/usr/lib/libQt5Core.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/corelib/ ./x86_64-linux/usr/lib/libQt5Test.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/testlib/ ./x86_64-linux/usr/lib/libQt5Sql.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/sql/ ./x86_64-linux/usr/lib/libQt5DBus.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/dbus/ Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 5 --- classes/qmake5_base.bbclass | 58 +++++++++++++++++---------- recipes-qt/qt5/qt5.inc | 10 +---- recipes-qt/qt5/qtbase-native.inc | 31 +++++++++----- recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtjsbackend-native.inc | 29 ++------------ 6 files changed, 63 insertions(+), 72 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 00d6c0eaec..68c19f7fa4 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,11 +6,6 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" -export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" -export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" -export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ee5ff7800b..b92799674a 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,35 +1,51 @@ +QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" +OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" +QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" -# We override this completely to eliminate the -e normally passed in -EXTRA_OEMAKE = ' MAKEFLAGS= ' +EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_AR="${AR} cqs" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," +EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${OE_QMAKE_MOC}" \ + UIC="${OE_QMAKE_UIC}" \ + RCC="${OE_QMAKE_RCC}" \ + MAKE="make -e ${PARALLEL_MAKE}"' + +export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" +export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" +export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" +export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" +export OE_QMAKE_CC = "${CC}" +export OE_QMAKE_CFLAGS = "${CFLAGS}" +export OE_QMAKE_CXX = "${CXX}" +export OE_QMAKE_LDFLAGS = "${LDFLAGS}" +export OE_QMAKE_AR = "${AR} cqs" +export OE_QMAKE_STRIP = "echo" +export OE_QMAKE_RPATH = "-Wl,-rpath-link," +export OE_QMAKE_CONF_COMPILER = "g++" +export QT_CONF_PATH = "${WORKDIR}/qt.conf" +export QT_DIR_NAME ?= "qt5" # do not export STRIP to the environment STRIP[unexport] = "1" do_generate_qt_config_file() { - - export QT_CONF_PATH=${WORKDIR}/qt.conf cat > ${WORKDIR}/qt.conf <> $QT_CONF_PATH echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH - echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH + echo "HostBinaries=${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH ./configure -v \ diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 37e2b80d9e..56bb854c11 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -7,44 +7,21 @@ QT_MODULE = "qtjsbackend" INC_PR = "r0" -inherit native +inherit native qmake5_base SRC_URI += "\ - file://module_qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " # Bitbake will not respect the make order set by qmake and at times it will try to compile # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail -PARALLEL_MAKE = "" - -export QT_CONF_PATH="${WORKDIR}/qt.conf" +#PARALLEL_MAKE = "" do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - cat > ${WORKDIR}/qt.conf < Date: Wed, 3 Apr 2013 16:42:45 +0200 Subject: [PATCH 059/347] qtbase: use the same patch for qt.conf override for target and native --- recipes-qt/qt5/qtbase-native.inc | 3 +- ...-qt.conf-override-when-bootstrapping.patch | 30 ------------ recipes-qt/qt5/qtbase.inc | 2 +- ...ow-the-specification-of-where-to-loa.patch | 32 ------------- ...ow-to-set-qt.conf-from-the-outside-u.patch | 46 +++++++++++++++++++ 5 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch delete mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch create mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index c401c7bde4..43e3253056 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -13,8 +13,7 @@ SSTATE_SCAN_FILES += "*.pri *.prl" QT_DIR_NAME ?= "qt5" SRC_URI += " \ - file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ - file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0001-Always-build-uic.patch \ " diff --git a/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch deleted file mode 100644 index 1b294fd2f9..0000000000 --- a/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 15:32:33 -0800 -Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - qmake/option.cpp | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/qmake/option.cpp b/qmake/option.cpp -index 91c154a..a4f3a85 100644 ---- a/qmake/option.cpp -+++ b/qmake/option.cpp -@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) - - QString qt_libraryInfoFile() - { -+ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ if (QFile::exists(qtconfig)) { -+ return qtconfig; -+ } - if (!Option::globals->qmake_abslocation.isEmpty()) - return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); - return QString(); --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index d4a5652def..8ada1910ff 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,7 +1,7 @@ require qt5.inc SRC_URI += " \ - file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ file://qmake.conf.sh \ diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch deleted file mode 100644 index 10219ec990..0000000000 --- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4dcf1eeaa1742435027ad0cb2a218e7e9b776011 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Mon, 19 Nov 2012 10:19:52 -0200 -Subject: [PATCH] qlibraryinfo: Allow the specification of where to load - qt.conf - -This is important to allow cross toolchains to work out of box. - -This patch was based on an existent patch in OpenEmbedded. - -Change-Id: Idc4feee95a9961db02752d88da9cfe360e89f8e3 ---- - src/corelib/global/qlibraryinfo.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index a756577..0c92e12 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -164,6 +164,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - } - #endif -+ if (!QFile::exists(qtconfig)) { -+ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ } - if (QFile::exists(qtconfig)) - return new QSettings(qtconfig, QSettings::IniFormat); - return 0; //no luck --- -1.7.10.4 - diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..857d5e84e7 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,46 @@ +From 2af433da710aff74445cb5148d369427bdd501de Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH] 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 | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index 747fd87..c9f8170 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -140,6 +140,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + { + QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); + #ifdef QT_BOOTSTRAPPED ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ } + if(!QFile::exists(qtconfig)) + qtconfig = qt_libraryInfoFile(); + #else +@@ -164,6 +168,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + } + #endif ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ } + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + return 0; //no luck +-- +1.8.1.5 + From e9c61a9e6f51f500df349f8fe569ec095a1b8d2b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 16:47:26 +0200 Subject: [PATCH 060/347] qmake: fix MAKEFLAGS when PARALLEL_MAKE has space * quotes are needed, because some people have '-j 9' instead of '-j9' * this can in theory cause PARALLEL_MAKE x PARALLEL_MAKE threads, because MAKE itself is using PARALLEL_MAKE threads to run inner makes --- classes/qmake5_base.bbclass | 2 +- recipes-qt/qt5/qtbase-native.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index b92799674a..c91f7bd16c 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -2,7 +2,7 @@ QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" -EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' +EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 43e3253056..d9cc487043 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -18,7 +18,7 @@ SRC_URI += " \ " EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' -EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' +EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_OECONF = " \ -prefix ${prefix} \ From 94ca12bf49ff6201b37476471403a5384b51b167 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 16:51:02 +0200 Subject: [PATCH 061/347] qmake5_base: define both QMAKESPEC and let recipe select which one to use * different platform/xplatform can enable cross-compile build in upstream qmake but that's not the same as what recipes are doing (upstream builds native tools when bootstraping target qtbase, recipes build native tools with separate qtbase-native and then want to skip building tools) * still separate variables for both QMAKESPECs can be useful e.g. for other native recipes --- classes/qmake5_base.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index c91f7bd16c..ba13242cd2 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,6 +1,8 @@ -QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" +QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" +OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++" + +QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs" OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" -QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" @@ -13,7 +15,8 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ RCC="${OE_QMAKE_RCC}" \ MAKE="make -e ${PARALLEL_MAKE}"' -export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++" +export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" +export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" From eb1ad81906d8a40acb5a6691012d32772318433a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 17:18:53 +0200 Subject: [PATCH 062/347] qtbase: add patch to eval QMAKE_CXX * fixes errors in log.do_configure trying to call wrong CXX --- recipes-qt/qt5/qtbase.inc | 1 + .../0004-configure-eval-QMAKE_CXX.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 8ada1910ff..cda46d5792 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -4,6 +4,7 @@ SRC_URI += " \ file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0004-configure-eval-QMAKE_CXX.patch \ file://qmake.conf.sh \ file://qplatformdefs.h \ " diff --git a/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch b/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch new file mode 100644 index 0000000000..06fa486297 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch @@ -0,0 +1,35 @@ +From bc6f13a50ad1c69e728062375d979796977d2b73 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Wed, 26 Sep 2012 20:47:08 +0200 +Subject: [PATCH] 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 +--- + configure | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index e23ea22..d83cf74 100755 +--- a/configure ++++ b/configure +@@ -2623,7 +2623,9 @@ 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=$QMAKE_CONF_COMPILER + if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +-- +1.8.1.5 + From 2b5c531b22703025e67b2f207db91ea178f7ead5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Dec 2012 16:40:13 +0100 Subject: [PATCH 063/347] qtbase: don't touch STAGING and bypass sstate Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 12 +++++++++ recipes-qt/qt5/qtbase.inc | 38 ++++------------------------- recipes-qt/qt5/qtbase/qmake.conf.sh | 3 ++- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 8d5dd81edc..8ed4c2883c 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -62,6 +62,18 @@ do_configure() { ln -sf ${OE_QMAKE_QMAKE} bin/qmake fi + if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then + ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + fi + + if [ -f mkspecs/common/g++-unix.conf ] ; then + # mkspecs were refactored for 4.8.0 + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf + else + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf + fi + cp -f ${WORKDIR}/linux.conf mkspecs/common/ + # Avoid problems with the linkers, since we want the linker to be g++ unset LD } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index cda46d5792..ec46db129d 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -44,35 +44,13 @@ do_configure_append() { cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf - ### Stage the base mkspecs so that 'HostData' will find them - mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} - cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ - ### Make sure that modules are installed correctly. During configure they will pick this one - ### instead of the one from ${S}/mkspecs... - sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' \ - ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf - rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* - ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR} sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf - ### Remove the old pri files - rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri - - - echo "[Paths]" > $QT_CONF_PATH - echo "Binaries=${bindir}" >> $QT_CONF_PATH - echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Libraries=${libdir}" >> $QT_CONF_PATH - echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH - echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH - echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH - echo "HostBinaries=${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH + # in qtbase case we want to find qmodule.pri in ${S}/mkspec + # ./features/qt_build_config.prf: QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri + echo "HostData = ${S}" >> ${QT_CONF_PATH} ./configure -v \ -dont-process \ @@ -92,22 +70,16 @@ do_configure_append() { -xplatform ${TARGET_OS}-oe-g++ \ ${QT_CONFIG_FLAGS} - ### Since we are pointing our host data we need to get them there before compilation - if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then - cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ - fi - ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well - cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri - cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri - ### As we provided the '-dont-process' switch inorder to allow us to stage a few files ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) + export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" ${OE_QMAKE_QMAKE} -r -d } do_compile_append() { # Build qmake for the target arch cd ${S}/qmake + export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" ${OE_QMAKE_QMAKE} oe_runmake CC="${CC}" CXX="${CXX}" cd ${S} diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh index 52682396d4..49d9de2ad8 100644 --- a/recipes-qt/qt5/qtbase/qmake.conf.sh +++ b/recipes-qt/qt5/qtbase/qmake.conf.sh @@ -34,6 +34,7 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS} QMAKE_CXX = ${OE_QMAKE_CXX} QMAKE_LINK = ${OE_QMAKE_LINK} QMAKE_LINK_SHLIB = ${OE_QMAKE_LINK} +QMAKE_CONF_COMPILER = ${OE_QMAKE_CONF_COMPILER} load(qt_config) -EOF \ No newline at end of file +EOF From 85b0bb644509e04c0132dc027f288d6f22ffb19e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 30 Mar 2013 04:04:20 +0100 Subject: [PATCH 064/347] qtbase: correctly configure --- recipes-qt/qt5/qt5.inc | 11 ++--- recipes-qt/qt5/qtbase.inc | 63 ++++++++++++++++------------- recipes-qt/qt5/qtbase/qmake.conf.sh | 1 + 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 8ed4c2883c..2a0ae591f3 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -56,6 +56,7 @@ QT_CONFIG_FLAGS += " \ " do_configure() { +# set_arch set_endian if [ ! -e bin/qmake ]; then @@ -66,13 +67,9 @@ do_configure() { ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ fi - if [ -f mkspecs/common/g++-unix.conf ] ; then - # mkspecs were refactored for 4.8.0 - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf - else - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf - fi - cp -f ${WORKDIR}/linux.conf mkspecs/common/ + # replace common files with our version + cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf + cp -f ${WORKDIR}/linux.conf mkspecs/common/linux.conf # Avoid problems with the linkers, since we want the linker to be g++ unset LD diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index ec46db129d..f92d37ea33 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -12,13 +12,16 @@ SRC_URI += " \ DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h -# DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" +XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" # reenable when we switch to "-qt-xcb" and build of +# DEPENDS += "${XCB_DEPENDS}" +# QT_MODULE_FLAGS = "-qt-xcb" # src/platformsupport/glxconvenience/ is resolved to be before build of # src/plugins/platforms/xcb/ QT_MODULE_FLAGS = "-no-xcb" + INC_PR = "r0" QT_BASE_NAME = "qt5" @@ -29,28 +32,32 @@ ARM_INSTRUCTION_SET = "arm" inherit qmake5 +do_generate_qt_config_file() { + : + cat > ${WORKDIR}/qt.conf < mkspecs/${TARGET_OS}-oe-g++/qmake.conf - - ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib - ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR} - sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf - - # in qtbase case we want to find qmodule.pri in ${S}/mkspec - # ./features/qt_build_config.prf: QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri - echo "HostData = ${S}" >> ${QT_CONF_PATH} + # qtbase is exception, create mkspecs for it + if [ ! -e ${OE_XQMAKESPEC} ]; then + mkdir -p ${OE_XQMAKESPEC} + bash ${WORKDIR}/qmake.conf.sh > ${OE_XQMAKESPEC}/qmake.conf + fi ./configure -v \ -dont-process \ @@ -58,7 +65,7 @@ do_configure_append() { -prefix ${prefix} \ -bindir ${bindir} \ -libdir ${libdir} \ - -datadir ${datadir}/${QT_DIR_NAME} \ + -datadir ${S} \ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ -docdir ${docdir}/${QT_DIR_NAME} \ -headerdir ${includedir}/${QT_DIR_NAME} \ @@ -66,20 +73,18 @@ do_configure_append() { -importdir ${libdir}/${QT_DIR_NAME}/imports \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ - -platform ${TARGET_OS}-oe-g++ \ - -xplatform ${TARGET_OS}-oe-g++ \ + -hostdatadir ${S} \ + -hostbindir ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} \ + -platform ${OE_QMAKESPEC} \ + -xplatform ${OE_XQMAKESPEC} \ ${QT_CONFIG_FLAGS} - ### As we provided the '-dont-process' switch inorder to allow us to stage a few files - ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) - export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" ${OE_QMAKE_QMAKE} -r -d } do_compile_append() { # Build qmake for the target arch cd ${S}/qmake - export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" ${OE_QMAKE_QMAKE} oe_runmake CC="${CC}" CXX="${CXX}" cd ${S} diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh index 49d9de2ad8..a3164d6893 100644 --- a/recipes-qt/qt5/qtbase/qmake.conf.sh +++ b/recipes-qt/qt5/qtbase/qmake.conf.sh @@ -35,6 +35,7 @@ QMAKE_CXX = ${OE_QMAKE_CXX} QMAKE_LINK = ${OE_QMAKE_LINK} QMAKE_LINK_SHLIB = ${OE_QMAKE_LINK} QMAKE_CONF_COMPILER = ${OE_QMAKE_CONF_COMPILER} +QMAKE_QT_CONFIG = ${OE_QMAKE_QT_CONFIG} load(qt_config) EOF From de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 21:06:13 +0200 Subject: [PATCH 065/347] qtbase: drop qmake.conf.sh and qplatformdefs * defaults in linux-g++ are correct, we need only to modify common linux.conf and g++-unix.conf --- recipes-qt/qt5/qtbase.inc | 8 ------ recipes-qt/qt5/qtbase/qmake.conf.sh | 41 --------------------------- recipes-qt/qt5/qtbase/qplatformdefs.h | 1 - 3 files changed, 50 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/qmake.conf.sh delete mode 100644 recipes-qt/qt5/qtbase/qplatformdefs.h diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f92d37ea33..e42dc350c0 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -5,8 +5,6 @@ SRC_URI += " \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ file://0004-configure-eval-QMAKE_CXX.patch \ - file://qmake.conf.sh \ - file://qplatformdefs.h \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" @@ -53,12 +51,6 @@ EOF OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" do_configure_append() { - # qtbase is exception, create mkspecs for it - if [ ! -e ${OE_XQMAKESPEC} ]; then - mkdir -p ${OE_XQMAKESPEC} - bash ${WORKDIR}/qmake.conf.sh > ${OE_XQMAKESPEC}/qmake.conf - fi - ./configure -v \ -dont-process \ -opensource -confirm-license \ diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh deleted file mode 100644 index a3164d6893..0000000000 --- a/recipes-qt/qt5/qtbase/qmake.conf.sh +++ /dev/null @@ -1,41 +0,0 @@ -cat < Date: Wed, 3 Apr 2013 21:52:54 +0200 Subject: [PATCH 066/347] qtbase: replace g++.conf and linux.conf with qmake.conf * g++.conf and linux.conf were outdated a lot, lacking new options like QMAKE_COMPILER causing a lot of warning like: Project WARNING: qmake spec does not announce the compiler family. Guessed gcc. * Instead of replacing whole common files, use custom qmake.conf which overwrites common setting after including it --- classes/qmake5_base.bbclass | 1 + recipes-qt/qt5/files/g++.conf | 56 ------------------------ recipes-qt/qt5/files/linux.conf | 74 -------------------------------- recipes-qt/qt5/qt5-5.0.0+git.inc | 2 - recipes-qt/qt5/qt5-5.0.1.inc | 2 - recipes-qt/qt5/qt5.inc | 14 +----- recipes-qt/qt5/qtbase-native.inc | 20 ++++++--- recipes-qt/qt5/qtbase.inc | 11 +++++ recipes-qt/qt5/qtbase/qmake.conf | 39 +++++++++++++++++ 9 files changed, 67 insertions(+), 152 deletions(-) delete mode 100644 recipes-qt/qt5/files/g++.conf delete mode 100644 recipes-qt/qt5/files/linux.conf create mode 100644 recipes-qt/qt5/qtbase/qmake.conf diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ba13242cd2..ed25e739b6 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -21,6 +21,7 @@ export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" +export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" export OE_QMAKE_CXX = "${CXX}" diff --git a/recipes-qt/qt5/files/g++.conf b/recipes-qt/qt5/files/g++.conf deleted file mode 100644 index 14cd3e1d77..0000000000 --- a/recipes-qt/qt5/files/g++.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# qmake configuration for common 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 $$QMAKE_CXXFLAGS $(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, - -# some linking helper... -CONFIG += rpath_libdirs - -# for the SDK -isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) diff --git a/recipes-qt/qt5/files/linux.conf b/recipes-qt/qt5/files/linux.conf deleted file mode 100644 index 08e84f2362..0000000000 --- a/recipes-qt/qt5/files/linux.conf +++ /dev/null @@ -1,74 +0,0 @@ -# -# qmake configuration for common linux -# - -QMAKE_CFLAGS_THREAD += -D_REENTRANT -QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = -QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_EGL = -QMAKE_LIBDIR_EGL = -QMAKE_INCDIR_OPENVG = -QMAKE_LIBDIR_OPENVG = - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) -QMAKE_LIBS_NIS = -lnsl -QMAKE_LIBS_EGL = -lEGL -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -QMAKE_LIBS_OPENVG = -lOpenVG -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_LIBUDEV = -ludev - -QMAKE_CFLAGS_WAYLAND = -QMAKE_INCDIR_WAYLAND = -QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client -QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server -QMAKE_LIBDIR_WAYLAND = -QMAKE_DEFINES_WAYLAND = -QMAKE_WAYLAND_SCANNER = wayland-scanner - -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-qt/qt5/qt5-5.0.0+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc index 9f2e2f3172..a1ac0e7643 100644 --- a/recipes-qt/qt5/qt5-5.0.0+git.inc +++ b/recipes-qt/qt5/qt5-5.0.0+git.inc @@ -3,8 +3,6 @@ # each module needs to define valid SRCREV SRC_URI += " \ git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \ - file://linux.conf \ - file://g++.conf \ " S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc index 4bdfaeed54..dcfc7d1151 100644 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ b/recipes-qt/qt5/qt5-5.0.1.inc @@ -4,8 +4,6 @@ QT_VERSION ?= "${PV}" SRC_URI += " \ http://releases.qt-project.org/qt5/${QT_VERSION}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ - file://linux.conf \ - file://g++.conf \ " S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 2a0ae591f3..b8d09fe3bf 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -56,21 +56,9 @@ QT_CONFIG_FLAGS += " \ " do_configure() { -# set_arch + set_arch set_endian - if [ ! -e bin/qmake ]; then - ln -sf ${OE_QMAKE_QMAKE} bin/qmake - fi - - if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then - ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ - fi - - # replace common files with our version - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf - cp -f ${WORKDIR}/linux.conf mkspecs/common/linux.conf - # Avoid problems with the linkers, since we want the linker to be g++ unset LD } diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index d9cc487043..0f196e4ea1 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -15,6 +15,7 @@ QT_DIR_NAME ?= "qt5" SRC_URI += " \ file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0001-Always-build-uic.patch \ + file://qmake.conf \ " EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' @@ -56,6 +57,20 @@ EXTRA_OECONF = " \ -no-rpath \ " +# qtbase is exception, we need to use mkspecs from ${S} +QMAKE_MKSPEC_PATH_NATIVE = "${S}/mkspecs" + +do_configure_prepend() { + if [ ! -e ${OE_QMAKESPEC} ]; then + mkdir -p ${OE_QMAKESPEC} + fi + # use default qplatformdefs.h from linux-g++ + cp -va ${QMAKE_MKSPEC_PATH_NATIVE}/linux-g++/qplatformdefs.h ${OE_QMAKESPEC}/ + # use modified qmake.conf which is using OE_QMAKE_* shell variables + # exported from qmake5_base.bbclass to define toolchain and flags + cp -va ${WORKDIR}/qmake.conf ${OE_QMAKESPEC}/ +} + do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD @@ -65,9 +80,4 @@ do_configure() { do_install() { oe_runmake install INSTALL_ROOT=${D} - ln -sf linux-g++ ${D}${datadir}/${QT_DIR_NAME}/mkspecs/${BUILD_OS}-oe-g++ - - # replace common files with our version - cp -f ${WORKDIR}/g++.conf ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/g++-unix.conf - cp -f ${WORKDIR}/linux.conf ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index e42dc350c0..644c122cd4 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -5,6 +5,7 @@ SRC_URI += " \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ file://0004-configure-eval-QMAKE_CXX.patch \ + file://qmake.conf \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" @@ -48,9 +49,19 @@ EOF } # qtbase is exception, we need to use mkspecs from ${S} +QMAKE_MKSPEC_PATH = "${S}/mkspecs" OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" do_configure_append() { + if [ ! -e ${OE_XQMAKESPEC} ]; then + mkdir -p ${OE_XQMAKESPEC} + fi + # use default qplatformdefs.h from linux-g++ + cp -va ${QMAKE_MKSPEC_PATH}/linux-g++/qplatformdefs.h ${OE_XQMAKESPEC}/ + # use modified qmake.conf which is using OE_QMAKE_* shell variables + # exported from qmake5_base.bbclass to define toolchain and flags + cp -va ${WORKDIR}/qmake.conf ${OE_XQMAKESPEC}/ + ./configure -v \ -dont-process \ -opensource -confirm-license \ diff --git a/recipes-qt/qt5/qtbase/qmake.conf b/recipes-qt/qt5/qtbase/qmake.conf new file mode 100644 index 0000000000..d60288e3f8 --- /dev/null +++ b/recipes-qt/qt5/qtbase/qmake.conf @@ -0,0 +1,39 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# + +MAKEFILE_GENERATOR = UNIX +CONFIG += incremental gdb_dwarf_index +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) + +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) From 1a272bc79d0e9aba9385d00b0aa1acf116552ad5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 20:18:50 +0200 Subject: [PATCH 067/347] qtbase: 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 --- recipes-qt/qt5/qtbase/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/qmake.conf b/recipes-qt/qt5/qtbase/qmake.conf index d60288e3f8..42966fe55e 100644 --- a/recipes-qt/qt5/qtbase/qmake.conf +++ b/recipes-qt/qt5/qtbase/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) From 1a2ad7b702e5c79f92fb95f14d6c75fdf69241c7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 22:03:04 +0200 Subject: [PATCH 068/347] qmake5_base: drop unused exports UIC/MOC/RCC are no longer defined in generated Makefiles --- classes/qmake5_base.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ed25e739b6..92b3317fbe 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -9,18 +9,13 @@ EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${OE_QMAKE_MOC}" \ - UIC="${OE_QMAKE_UIC}" \ - RCC="${OE_QMAKE_RCC}" \ + AR="${OE_QMAKE_AR}" \ + STRIP="${OE_QMAKE_STRIP}" \ MAKE="make -e ${PARALLEL_MAKE}"' export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" -export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" -export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" -export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" @@ -28,8 +23,6 @@ export OE_QMAKE_CXX = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR} cqs" export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_RPATH = "-Wl,-rpath-link," -export OE_QMAKE_CONF_COMPILER = "g++" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" From e16556b8c7c937d810dd9234a62e2ab03521ed11 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 5 Apr 2013 19:50:23 +0200 Subject: [PATCH 069/347] qtbase: add udev to DEPENDS * it's autodetected, causing undeterministic builds Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 644c122cd4..7a1c9452ae 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -8,7 +8,7 @@ SRC_URI += " \ file://qmake.conf \ " -DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" +DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" From 1e5520a64f0c78f238b0399ac6cbfb3510eeb530 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 16:40:27 +0200 Subject: [PATCH 070/347] qt5-5.0.1: use QT_VERSION_DIR, just for consistence" Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.0.1.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc index dcfc7d1151..00b43f40bd 100644 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ b/recipes-qt/qt5/qt5-5.0.1.inc @@ -2,8 +2,11 @@ QT_VERSION ?= "${PV}" +# it's different for RC versions +QT_VERSION_DIR ?= "${QT_VERSION}" + SRC_URI += " \ - http://releases.qt-project.org/qt5/${QT_VERSION}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ " S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" From 97738e9d62b613ea46cf8c5edb6accdff0d0b19a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 16:33:22 +0200 Subject: [PATCH 071/347] qt5: unify indentation * use 4 spaces everywhere like meta-oe and other layers do now --- recipes-qt/qt5/qt5-5.0.0+git.inc | 2 +- recipes-qt/qt5/qt5.inc | 45 +++++++++--------- recipes-qt/qt5/qt5_arch.inc | 14 +++--- recipes-qt/qt5/qtbase-native.inc | 80 ++++++++++++++++---------------- recipes-qt/qt5/qtbase.inc | 11 ++--- recipes-qt/qt5/qtdeclarative.inc | 2 +- recipes-qt/qt5/qtjsbackend.inc | 6 +-- 7 files changed, 79 insertions(+), 81 deletions(-) diff --git a/recipes-qt/qt5/qt5-5.0.0+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc index a1ac0e7643..d44eeecfeb 100644 --- a/recipes-qt/qt5/qt5-5.0.0+git.inc +++ b/recipes-qt/qt5/qt5-5.0.0+git.inc @@ -2,7 +2,7 @@ # each module needs to define valid SRCREV SRC_URI += " \ - git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \ + git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \ " S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b8d09fe3bf..b3ab210360 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -35,24 +35,24 @@ QT_EXAMPLES ?= "-nomake examples" QT_DEMOS ?= "-nomake demos" QT_CONFIG_FLAGS += " \ - -release \ - -reduce-relocations \ - -shared \ - -silent \ - -glib \ - -no-pch \ - -no-rpath \ - -pkg-config \ - ${QT_SYSTEM_LIBS} \ - ${QT_NIS} \ - ${QT_CUPS} \ - ${QT_SQL_DRIVER_FLAGS} \ - ${QT_DISTRO_FLAGS} \ - ${QT_MODULE_FLAGS} \ - ${QT_GLFLAGS} \ - ${QT_TESTS} \ - ${QT_EXAMPLES} \ - ${QT_DEMOS} \ + -release \ + -reduce-relocations \ + -shared \ + -silent \ + -glib \ + -no-pch \ + -no-rpath \ + -pkg-config \ + ${QT_SYSTEM_LIBS} \ + ${QT_NIS} \ + ${QT_CUPS} \ + ${QT_SQL_DRIVER_FLAGS} \ + ${QT_DISTRO_FLAGS} \ + ${QT_MODULE_FLAGS} \ + ${QT_GLFLAGS} \ + ${QT_TESTS} \ + ${QT_EXAMPLES} \ + ${QT_DEMOS} \ " do_configure() { @@ -64,7 +64,6 @@ do_configure() { } do_compile() { - unset CFLAGS CXXFLAGS AR oe_runmake ${EXTRA_ENV} @@ -80,8 +79,8 @@ FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}" FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*" FILES_${PN}-dev += " \ - ${libdir}/cmake/* \ - ${libdir}/*.prl \ - ${includedir}/qt5/* \ - ${datadir}/qt5/* \ + ${libdir}/cmake/* \ + ${libdir}/*.prl \ + ${includedir}/qt5/* \ + ${datadir}/qt5/* \ " diff --git a/recipes-qt/qt5/qt5_arch.inc b/recipes-qt/qt5/qt5_arch.inc index 7048d7a368..25fbf90450 100644 --- a/recipes-qt/qt5/qt5_arch.inc +++ b/recipes-qt/qt5/qt5_arch.inc @@ -1,13 +1,13 @@ inherit siteinfo set_arch() { - case ${TARGET_ARCH} in - arm*) QT_ARCH=arm ;; - i*86*) QT_ARCH=i386 ;; - mips*) QT_ARCH=mips ;; - powerpc*) QT_ARCH=powerpc ;; - x86_64*) QT_ARCH=x86_64 ;; - esac + case ${TARGET_ARCH} in + arm*) QT_ARCH=arm ;; + i*86*) QT_ARCH=i386 ;; + mips*) QT_ARCH=mips ;; + powerpc*) QT_ARCH=powerpc ;; + x86_64*) QT_ARCH=x86_64 ;; + esac } set_endian() { diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 0f196e4ea1..d601d2cee2 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -13,48 +13,48 @@ SSTATE_SCAN_FILES += "*.pri *.prl" QT_DIR_NAME ?= "qt5" SRC_URI += " \ - file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0001-Always-build-uic.patch \ - file://qmake.conf \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0001-Always-build-uic.patch \ + file://qmake.conf \ " EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_OECONF = " \ - -prefix ${prefix} \ - -L ${STAGING_LIBDIR_NATIVE} \ - -I ${STAGING_INCDIR_NATIVE} \ - -system-zlib \ - -no-libjpeg \ - -no-libpng \ - -no-gif \ - -no-accessibility \ - -no-cups \ - -no-nis \ - -no-gui \ - -no-qml-debug \ - -no-sql-mysql \ - -no-sql-sqlite \ - -no-opengl \ - -no-openssl \ - -no-xcb \ - -verbose -release \ - -prefix ${prefix} \ - -bindir ${bindir}/${QT_DIR_NAME} \ - -headerdir ${includedir}/${QT_DIR_NAME} \ - -archdatadir ${libdir}/${QT_DIR_NAME} \ - -datadir ${datadir}/${QT_DIR_NAME} \ - -docdir ${docdir}/${QT_DIR_NAME} \ - -hostdatadir ${datadir}/${QT_DIR_NAME} \ - -hostbindir ${bindir}/${QT_DIR_NAME} \ - -no-glib \ - -no-iconv \ - -silent \ - -nomake examples \ - -nomake tests \ - -nomake demos \ - -no-rpath \ + -prefix ${prefix} \ + -L ${STAGING_LIBDIR_NATIVE} \ + -I ${STAGING_INCDIR_NATIVE} \ + -system-zlib \ + -no-libjpeg \ + -no-libpng \ + -no-gif \ + -no-accessibility \ + -no-cups \ + -no-nis \ + -no-gui \ + -no-qml-debug \ + -no-sql-mysql \ + -no-sql-sqlite \ + -no-opengl \ + -no-openssl \ + -no-xcb \ + -verbose -release \ + -prefix ${prefix} \ + -bindir ${bindir}/${QT_DIR_NAME} \ + -headerdir ${includedir}/${QT_DIR_NAME} \ + -archdatadir ${libdir}/${QT_DIR_NAME} \ + -datadir ${datadir}/${QT_DIR_NAME} \ + -docdir ${docdir}/${QT_DIR_NAME} \ + -hostdatadir ${datadir}/${QT_DIR_NAME} \ + -hostbindir ${bindir}/${QT_DIR_NAME} \ + -no-glib \ + -no-iconv \ + -silent \ + -nomake examples \ + -nomake tests \ + -nomake demos \ + -no-rpath \ " # qtbase is exception, we need to use mkspecs from ${S} @@ -72,12 +72,12 @@ do_configure_prepend() { } do_configure() { - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD - (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { - oe_runmake install INSTALL_ROOT=${D} + oe_runmake install INSTALL_ROOT=${D} } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 7a1c9452ae..ad5599627f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,11 +1,11 @@ require qt5.inc SRC_URI += " \ - file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ - file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0004-configure-eval-QMAKE_CXX.patch \ - file://qmake.conf \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ + file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0004-configure-eval-QMAKE_CXX.patch \ + file://qmake.conf \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" @@ -20,7 +20,6 @@ XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" QT_MODULE_FLAGS = "-no-xcb" - INC_PR = "r0" QT_BASE_NAME = "qt5" diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index db944be647..5746413407 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -12,7 +12,7 @@ inherit qmake5 SRC_URI += " \ file://module_qmake.conf \ - " +" export QT_CONF_PATH="${WORKDIR}/qt.conf" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 3da6cc76ac..3ee101784b 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -22,10 +22,10 @@ PARALLEL_MAKE = "" export QT_CONF_PATH="${WORKDIR}/qt.conf" do_configure () { - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD - # This should not be needed. Perhaps the lack of this file is an indication + # This should not be needed. Perhaps the lack of this file is an indication # of an error on the native recipe... cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf From fe65aed3393cf32efe6158c615e72aea407a4bc6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 14:13:27 +0200 Subject: [PATCH 072/347] qtbase: improve internal build system to support OE way of building qt * add linux-oe-g++ mkspec directly with patch * add functions to read and eval OE_QMAKE functions from mkspec and also export them with QMakeVar to be available also for config.tests * add external-host-bindir parameter to skip building native tools even when we're in fact cross-compiling (because we have them from qtbase-native build already). * use separated ${B} and ${S} and clean ${B} when reconfiguring stalled qmake cache can be used when configure is reexecuted cleaning ${B} prevents that and provide cleaner separation * OE_QMAKE_AR cqs is added by Makefile, having it here too was causing issues * isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist() even when it allows to incorrectly set wrong directory and build native tools again (instead of skipping them) Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 61 +++- recipes-qt/qt5/qt5.inc | 9 + recipes-qt/qt5/qtbase-native.inc | 51 +-- recipes-qt/qt5/qtbase.inc | 76 +++-- .../qtbase/0001-Add-linux-oe-g-platform.patch | 303 ++++++++++++++++++ ...ow-to-set-qt.conf-from-the-outside-u.patch | 46 --- ...ow-to-set-qt.conf-from-the-outside-u.patch | 46 +++ .../0003-Add-external-hostbindir-option.patch | 219 +++++++++++++ .../0004-configure-eval-QMAKE_CXX.patch | 35 -- ...e-is-already-built-in-qtbase-native.patch} | 19 +- ...ing-a-separate-qmake-for-the-target.patch} | 15 +- ...tions-temporary-remove-isEmpty-check.patch | 46 +++ recipes-qt/qt5/qtbase/qmake.conf | 39 --- 13 files changed, 756 insertions(+), 209 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch delete mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch delete mode 100644 recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch rename recipes-qt/qt5/qtbase/{0002-qmake-is-already-built-in-qt5-tools-native.patch => 0004-qmake-is-already-built-in-qtbase-native.patch} (55%) rename recipes-qt/qt5/qtbase/{0003-Allow-building-a-separate-qmake-for-the-target.patch => 0005-Allow-building-a-separate-qmake-for-the-target.patch} (65%) create mode 100644 recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase/qmake.conf diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 92b3317fbe..3e757ab4ed 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,8 +1,12 @@ -QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" -OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++" +# This is useful for target recipes to reference native mkspecs +QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" -QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs" -OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" +QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" + +# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds +OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++" +OE_QMAKE_PLATFORM = "linux-oe-g++" EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" @@ -13,15 +17,17 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ STRIP="${OE_QMAKE_STRIP}" \ MAKE="make -e ${PARALLEL_MAKE}"' -export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" -export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" +export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" +export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" export OE_QMAKE_CXX = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" -export OE_QMAKE_AR = "${AR} cqs" +export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" @@ -32,17 +38,50 @@ STRIP[unexport] = "1" do_generate_qt_config_file() { cat > ${WORKDIR}/qt.conf <> ${WORKDIR}/qt.conf <> ${WORKDIR}/qt.conf +} + +#-dont-process EXTRA_OECONF = " \ -prefix ${prefix} \ - -L ${STAGING_LIBDIR_NATIVE} \ - -I ${STAGING_INCDIR_NATIVE} \ + -sysroot ${STAGING_DIR_NATIVE} \ + -no-gcc-sysroot \ -system-zlib \ -no-libjpeg \ -no-libpng \ @@ -39,15 +51,14 @@ EXTRA_OECONF = " \ -no-opengl \ -no-openssl \ -no-xcb \ - -verbose -release \ + -verbose \ + -release \ -prefix ${prefix} \ -bindir ${bindir}/${QT_DIR_NAME} \ -headerdir ${includedir}/${QT_DIR_NAME} \ -archdatadir ${libdir}/${QT_DIR_NAME} \ -datadir ${datadir}/${QT_DIR_NAME} \ -docdir ${docdir}/${QT_DIR_NAME} \ - -hostdatadir ${datadir}/${QT_DIR_NAME} \ - -hostbindir ${bindir}/${QT_DIR_NAME} \ -no-glib \ -no-iconv \ -silent \ @@ -55,27 +66,21 @@ EXTRA_OECONF = " \ -nomake tests \ -nomake demos \ -no-rpath \ + -platform linux-oe-g++ \ " -# qtbase is exception, we need to use mkspecs from ${S} -QMAKE_MKSPEC_PATH_NATIVE = "${S}/mkspecs" - do_configure_prepend() { - if [ ! -e ${OE_QMAKESPEC} ]; then - mkdir -p ${OE_QMAKESPEC} - fi - # use default qplatformdefs.h from linux-g++ - cp -va ${QMAKE_MKSPEC_PATH_NATIVE}/linux-g++/qplatformdefs.h ${OE_QMAKESPEC}/ - # use modified qmake.conf which is using OE_QMAKE_* shell variables - # exported from qmake5_base.bbclass to define toolchain and flags - cp -va ${WORKDIR}/qmake.conf ${OE_QMAKESPEC}/ -} + # Similar logic is in autotools.bbclass + if [ -d ${B} -a "${S}" != "${B}" ] ; then + # Existing separate build directory, exists, remove + rm -rf "${B}/*" + fi -do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +# bin/qmake -r -d ${S} || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index ad5599627f..f4462977ae 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,11 +1,12 @@ require qt5.inc SRC_URI += " \ - file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ - file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0004-configure-eval-QMAKE_CXX.patch \ - file://qmake.conf \ + 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-qmake-is-already-built-in-qtbase-native.patch \ + file://0005-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" @@ -30,44 +31,42 @@ ARM_INSTRUCTION_SET = "arm" inherit qmake5 -do_generate_qt_config_file() { - : - cat > ${WORKDIR}/qt.conf < ${WORKDIR}/qt.conf < +Date: Mon, 15 Apr 2013 04:29:32 +0200 +Subject: [PATCH 1/6] 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 + +* 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: Pending + +Signed-off-by: Martin Jansa +--- + configure | 54 ++++++++++++++++--- + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ + 3 files changed, 186 insertions(+), 7 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 89246c8..0ab8eee 100755 +--- a/configure ++++ b/configure +@@ -216,6 +216,16 @@ getQMakeConf() + getQMakeConf3 "$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 +@@ -224,6 +234,16 @@ getXQMakeConf() + getQMakeConf3 "$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" + for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" +@@ -2623,7 +2655,7 @@ else + CFG_FRAMEWORK=no + fi + +-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` ++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` + + TEST_COMPILER=$QMAKE_CONF_COMPILER + if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -2632,7 +2664,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 +@@ -3587,6 +3619,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. Please wait..." +@@ -3625,11 +3665,11 @@ 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_CXXFLAGS +- setBootstrapVariable QMAKE_LFLAGS ++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CFLAGS ++ setBootstrapEvalVariable QMAKE_CXXFLAGS ++ setBootstrapEvalVariable QMAKE_LFLAGS + + if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" +diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf +new file mode 100644 +index 0000000..42966fe +--- /dev/null ++++ b/mkspecs/linux-oe-g++/qmake.conf +@@ -0,0 +1,39 @@ ++# ++# 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) ++ ++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 +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index 857d5e84e7..0000000000 --- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2af433da710aff74445cb5148d369427bdd501de Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH] 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 | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 747fd87..c9f8170 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -140,6 +140,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - { - QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); - #ifdef QT_BOOTSTRAPPED -+ if (!QFile::exists(qtconfig)) { -+ QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = QFile::decodeName(config); -+ } - if(!QFile::exists(qtconfig)) - qtconfig = qt_libraryInfoFile(); - #else -@@ -164,6 +168,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - } - #endif -+ if (!QFile::exists(qtconfig)) { -+ QByteArray config = getenv("QT_CONF_PATH"); -+ qtconfig = QFile::decodeName(config); -+ } - if (QFile::exists(qtconfig)) - return new QSettings(qtconfig, QSettings::IniFormat); - return 0; //no luck --- -1.8.1.5 - diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..f2a6efcaac --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,46 @@ +From 29812cee9589dedd10a94b66ed5279549ed62f36 Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH 2/6] 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 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index a8dc086..c16dfcb 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -138,7 +138,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(); +@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + #endif + if (QFile::exists(qtconfig)) ++ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); + return new QSettings(qtconfig, QSettings::IniFormat); ++ printf("qt.conf wasn't found!!\n"); + return 0; //no luck + } + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch new file mode 100644 index 0000000000..ba4badca12 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -0,0 +1,219 @@ +From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 3/6] 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 + +Signed-off-by: Martin Jansa +--- + configure | 15 ++++++++++++++- + mkspecs/features/qt_functions.prf | 5 ++++- + mkspecs/features/qt_tool.prf | 2 +- + qmake/property.cpp | 1 + + qtbase.pro | 15 +++++++++++---- + src/corelib/global/qlibraryinfo.cpp | 3 ++- + src/corelib/global/qlibraryinfo.h | 1 + + tools/configure/configureapp.cpp | 8 ++++++++ + 8 files changed, 42 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 0ab8eee..50f1ef2 100755 +--- a/configure ++++ b/configure +@@ -928,6 +928,7 @@ CFG_GCC_SYSROOT="yes" + QT_HOST_PREFIX= + QT_HOST_BINS= + QT_HOST_DATA= ++QT_EXTERNAL_HOST_BINS= + + #flags for SQL drivers + QT_CFLAGS_PSQL= +@@ -1026,7 +1027,7 @@ while [ "$#" -gt 0 ]; do + VAL=no + ;; + #Qt style options that pass an argument +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1223,6 +1224,9 @@ while [ "$#" -gt 0 ]; do + hostbindir) + QT_HOST_BINS="$VAL" + ;; ++ external-hostbindir) ++ QT_EXTERNAL_HOST_BINS="$VAL" ++ ;; + pkg-config) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PKGCONFIG="$VAL" +@@ -2921,6 +2925,11 @@ else + QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` + fi + ++# 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 ++ + #------------------------------------------------------------------------------- + # help - interactive parts of the script _after_ this section please + #------------------------------------------------------------------------------- +@@ -3087,6 +3096,9 @@ 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 +@@ -3558,6 +3570,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { + "qt_hpfxpath=$QT_HOST_PREFIX", + "qt_hbinpath=$QT_HOST_BINS", + "qt_hdatpath=$QT_HOST_DATA", ++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", + "qt_targspec=$shortxspec", + "qt_hostspec=$shortspec", + #endif +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 389f241..e249960 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,10 @@ defineTest(qtAddModules) { + defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { +- $$1 = $$[QT_HOST_BINS/get]/$$2 ++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 ++ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ $$1 = $$[QT_HOST_BINS/get]/$$2 ++ } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).bat) { + $$1 = $$eval($$1).bat +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 16db6c7..5518933 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) { ++!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index bbd4734..dca0c58 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -74,6 +74,7 @@ static const struct { + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, + { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, + { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, + { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, + { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, + }; +diff --git a/qtbase.pro b/qtbase.pro +index e66d9fb..a6ae763 100644 +--- a/qtbase.pro ++++ b/qtbase.pro +@@ -68,17 +68,24 @@ CONFIG -= qt + + #qmake + qmake.path = $$[QT_HOST_BINS] ++qmake.files = $$OUT_PWD/bin/qmake ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 + + #syncqt + syncqt.path = $$[QT_HOST_BINS] + syncqt.files = $$PWD/bin/syncqt +-equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt ++} ++equals(QMAKE_HOST.os, Windows) { ++ syncqt.files = $${syncqt.files}.bat ++} + INSTALLS += syncqt + + #mkspecs +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index c16dfcb..56a269f 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() + */ + + static const struct { +- char key[19], value[13]; ++ char key[21], value[13]; + } qtConfEntries[] = { + { "Prefix", "." }, + { "Documentation", "doc" }, // should be ${Data}/doc +@@ -293,6 +293,7 @@ static const struct { + { "HostPrefix", "" }, + { "HostBinaries", "bin" }, + { "HostData", "." }, ++ { "ExternalHostBinaries", "" }, + { "TargetSpec", "" }, + { "HostSpec", "" }, + #endif +diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h +index a574b4b..1535d20 100644 +--- a/src/corelib/global/qlibraryinfo.h ++++ b/src/corelib/global/qlibraryinfo.h +@@ -85,6 +85,7 @@ public: + HostPrefixPath, + HostBinariesPath, + HostDataPath, ++ ExternalHostBinariesPath, + TargetSpecPath, + HostSpecPath, + LastHostPath = HostSpecPath, +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index 126643e..0e01ab5 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -1143,6 +1143,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_HOST_DATA" ] = 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) +@@ -3627,6 +3634,7 @@ void Configure::generateQConfigCpp() + << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl + << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl ++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl + << " \"qt_targspec=" << targSpec << "\"," << endl + << " \"qt_hostspec=" << hostSpec << "\"," << endl + << "#endif" << endl +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch b/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch deleted file mode 100644 index 06fa486297..0000000000 --- a/recipes-qt/qt5/qtbase/0004-configure-eval-QMAKE_CXX.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bc6f13a50ad1c69e728062375d979796977d2b73 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Wed, 26 Sep 2012 20:47:08 +0200 -Subject: [PATCH] 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 ---- - configure | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index e23ea22..d83cf74 100755 ---- a/configure -+++ b/configure -@@ -2623,7 +2623,9 @@ 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=$QMAKE_CONF_COMPILER - if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then --- -1.8.1.5 - diff --git a/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch similarity index 55% rename from recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch rename to recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch index 0c1f63c69e..91709741c2 100644 --- a/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch +++ b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch @@ -1,29 +1,30 @@ -From aab01049543f4508f1dc92fb62b980d1d0c3bcc0 Mon Sep 17 00:00:00 2001 +From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH] qmake is already built in qt5-tools-native +Subject: [PATCH 4/6] 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 files changed, 1 insertions(+), 1 deletions(-) + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index c3e61d6..5e43a19 100755 +index 50f1ef2..8710c28 100755 --- a/configure +++ b/configure -@@ -3594,7 +3594,7 @@ setBootstrapVariable() - } +@@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() + # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake. Please wait..." - #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured + mkdir -p "$outpath/qmake" || exit -- -1.7.4.1 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch similarity index 65% rename from recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch index 781d6e549b..4d16344383 100644 --- a/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,28 +1,29 @@ -From a2a01e1fd975e8e616b580423c3bf30db9c11b6d Mon Sep 17 00:00:00 2001 +From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH] Allow building a separate qmake for the target +Subject: [PATCH 5/6] 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 files changed, 1 insertions(+), 0 deletions(-) + qmake/qmake.pro | 1 + + 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..07fa80e 100644 +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 = qmake2 ++TARGET = qmake OBJECTS_DIR = . MOC_DIR = . -- -1.7.4.1 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 0000000000..d1cacd3efe --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,46 @@ +From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index e249960..105ba4c 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS/get]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 5518933..b0e4f28 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/qmake.conf b/recipes-qt/qt5/qtbase/qmake.conf deleted file mode 100644 index 42966fe55e..0000000000 --- a/recipes-qt/qt5/qtbase/qmake.conf +++ /dev/null @@ -1,39 +0,0 @@ -# -# 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) - -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) From 239e292d020c6494fbd6101888f8bed139572598 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 15:31:24 +0200 Subject: [PATCH 073/347] qt5: restore 5.0.0 recipes * there are some issues with 5.0.1 and qt-webkit, keep 5.0.0 available until everybody is ready to upgrade to 5.0.2 or newer Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.0.0.inc | 18 ++++++++++++++++++ recipes-qt/qt5/qtbase-native_5.0.0.bb | 9 +++++++++ recipes-qt/qt5/qtbase_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtdeclarative_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtjsbackend_5.0.0.bb | 7 +++++++ 6 files changed, 55 insertions(+) create mode 100644 recipes-qt/qt5/qt5-5.0.0.inc create mode 100644 recipes-qt/qt5/qtbase-native_5.0.0.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.0.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0.bb diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc new file mode 100644 index 0000000000..00b43f40bd --- /dev/null +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -0,0 +1,18 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +QT_VERSION ?= "${PV}" + +# it's different for RC versions +QT_VERSION_DIR ?= "${QT_VERSION}" + +SRC_URI += " \ + http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb new file mode 100644 index 0000000000..88c5ee1d64 --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.0.0.bb @@ -0,0 +1,9 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://0001-Always-build-uic.patch" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb new file mode 100644 index 0000000000..d9c922d608 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb new file mode 100644 index 0000000000..fb37cb8760 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" +SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" From 42ab168449bda4610a9c02b7560b56682316c63e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 18:10:40 +0200 Subject: [PATCH 074/347] qt5: add 5.0.2 * patch files are kept in separate dir, because I expect that 5.0.1 will have to live a bit longer for e.g. webkit-qt developers to adapt Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.0.2.inc | 21 ++ .../0001-Add-linux-oe-g-platform.patch | 303 ++++++++++++++++++ ...ow-to-set-qt.conf-from-the-outside-u.patch | 46 +++ .../0003-Add-external-hostbindir-option.patch | 219 +++++++++++++ ...ke-is-already-built-in-qtbase-native.patch | 30 ++ ...ding-a-separate-qmake-for-the-target.patch | 29 ++ ...tions-temporary-remove-isEmpty-check.patch | 46 +++ recipes-qt/qt5/qtbase-native_5.0.2.bb | 7 + recipes-qt/qt5/qtbase_5.0.2.bb | 7 + recipes-qt/qt5/qtdeclarative_5.0.2.bb | 7 + recipes-qt/qt5/qtjsbackend-native_5.0.2.bb | 7 + recipes-qt/qt5/qtjsbackend_5.0.2.bb | 7 + 12 files changed, 729 insertions(+) create mode 100644 recipes-qt/qt5/qt5-5.0.2.inc create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch create mode 100644 recipes-qt/qt5/qtbase-native_5.0.2.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.2.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.2.bb create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.2.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.2.bb diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc new file mode 100644 index 0000000000..e87f662d53 --- /dev/null +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -0,0 +1,21 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2013 Martin Jansa + +QT_VERSION ?= "${PV}" + +# it's different for RC versions +QT_VERSION_DIR ?= "${QT_VERSION}" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += " \ + http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch new file mode 100644 index 0000000000..bdbdd9fcf3 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -0,0 +1,303 @@ +From 9de9d0ccfacbac39d3eb171efe3e8c74a2417ae3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 15 Apr 2013 04:29:32 +0200 +Subject: [PATCH 1/6] 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 + +* 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: Pending + +Signed-off-by: Martin Jansa +--- + configure | 54 ++++++++++++++++--- + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ + 3 files changed, 186 insertions(+), 7 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 2ea1ea4..6db4577 100755 +--- a/configure ++++ b/configure +@@ -216,6 +216,16 @@ getQMakeConf() + getQMakeConf3 "$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 +@@ -224,6 +234,16 @@ getXQMakeConf() + getQMakeConf3 "$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" + for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" +@@ -2636,7 +2668,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then + CFG_QGTKSTYLE=no + fi + +-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` ++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` + + TEST_COMPILER=$QMAKE_CONF_COMPILER + if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -2645,7 +2677,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 +@@ -3613,6 +3645,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..." +@@ -3651,11 +3691,11 @@ 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_CXXFLAGS +- setBootstrapVariable QMAKE_LFLAGS ++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CFLAGS ++ setBootstrapEvalVariable QMAKE_CXXFLAGS ++ setBootstrapEvalVariable QMAKE_LFLAGS + + if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" +diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf +new file mode 100644 +index 0000000..42966fe +--- /dev/null ++++ b/mkspecs/linux-oe-g++/qmake.conf +@@ -0,0 +1,39 @@ ++# ++# 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) ++ ++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 +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..5bcc22e702 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,46 @@ +From 41257668e0cb03056d79b2917d54a6e01bf2ed36 Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH 2/6] 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 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index 5fb9640..acd11f5 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -138,7 +138,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(); +@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + #endif + if (QFile::exists(qtconfig)) ++ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); + return new QSettings(qtconfig, QSettings::IniFormat); ++ printf("qt.conf wasn't found!!\n"); + return 0; //no luck + } + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch new file mode 100644 index 0000000000..b31ebabe23 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -0,0 +1,219 @@ +From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 3/6] 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 + +Signed-off-by: Martin Jansa +--- + configure | 15 ++++++++++++++- + mkspecs/features/qt_functions.prf | 5 ++++- + mkspecs/features/qt_tool.prf | 2 +- + qmake/property.cpp | 1 + + qtbase.pro | 15 +++++++++++---- + src/corelib/global/qlibraryinfo.cpp | 3 ++- + src/corelib/global/qlibraryinfo.h | 1 + + tools/configure/configureapp.cpp | 8 ++++++++ + 8 files changed, 42 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 6db4577..1ca5b4e 100755 +--- a/configure ++++ b/configure +@@ -930,6 +930,7 @@ CFG_GCC_SYSROOT="yes" + QT_HOST_PREFIX= + QT_HOST_BINS= + QT_HOST_DATA= ++QT_EXTERNAL_HOST_BINS= + + #flags for SQL drivers + QT_CFLAGS_PSQL= +@@ -1028,7 +1029,7 @@ while [ "$#" -gt 0 ]; do + VAL=no + ;; + #Qt style options that pass an argument +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1213,6 +1214,9 @@ while [ "$#" -gt 0 ]; do + hostbindir) + QT_HOST_BINS="$VAL" + ;; ++ external-hostbindir) ++ QT_EXTERNAL_HOST_BINS="$VAL" ++ ;; + pkg-config) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PKGCONFIG="$VAL" +@@ -2941,6 +2945,11 @@ else + QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` + fi + ++# 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 ++ + #------------------------------------------------------------------------------- + # help - interactive parts of the script _after_ this section please + #------------------------------------------------------------------------------- +@@ -3107,6 +3116,9 @@ 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 +@@ -3584,6 +3596,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { + "qt_hpfxpath=$QT_HOST_PREFIX", + "qt_hbinpath=$QT_HOST_BINS", + "qt_hdatpath=$QT_HOST_DATA", ++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", + "qt_targspec=$shortxspec", + "qt_hostspec=$shortspec", + #endif +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 8cd2473..876f657 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { + defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { +- $$1 = $$[QT_HOST_BINS]/$$2 ++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 ++ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ $$1 = $$[QT_HOST_BINS]/$$2 ++ } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).bat) { + $$1 = $$eval($$1).bat +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 9d50856..8a636c7 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:force_independent { ++!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index c4fbcd6..c1b7a9f 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -74,6 +74,7 @@ static const struct { + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, + { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, + { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, + { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, + { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, + }; +diff --git a/qtbase.pro b/qtbase.pro +index 4c41cff..997ea6d 100644 +--- a/qtbase.pro ++++ b/qtbase.pro +@@ -68,17 +68,24 @@ CONFIG -= qt + + #qmake + qmake.path = $$[QT_HOST_BINS] ++qmake.files = $$OUT_PWD/bin/qmake ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 + + #syncqt + syncqt.path = $$[QT_HOST_BINS] + syncqt.files = $$PWD/bin/syncqt +-equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt ++} ++equals(QMAKE_HOST.os, Windows) { ++ syncqt.files = $${syncqt.files}.bat ++} + INSTALLS += syncqt + + # If we are doing a prefix build, create a "module" pri which enables +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index acd11f5..bba0861 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() + */ + + static const struct { +- char key[19], value[13]; ++ char key[21], value[13]; + } qtConfEntries[] = { + { "Prefix", "." }, + { "Documentation", "doc" }, // should be ${Data}/doc +@@ -297,6 +297,7 @@ static const struct { + { "HostPrefix", "" }, + { "HostBinaries", "bin" }, + { "HostData", "." }, ++ { "ExternalHostBinaries", "" }, + { "TargetSpec", "" }, + { "HostSpec", "" }, + #endif +diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h +index 054231b..37fe529 100644 +--- a/src/corelib/global/qlibraryinfo.h ++++ b/src/corelib/global/qlibraryinfo.h +@@ -85,6 +85,7 @@ public: + HostPrefixPath, + HostBinariesPath, + HostDataPath, ++ ExternalHostBinariesPath, + TargetSpecPath, + HostSpecPath, + LastHostPath = HostSpecPath, +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index 22ee456..cfc6f97 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -1156,6 +1156,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_HOST_DATA" ] = 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) +@@ -3657,6 +3664,7 @@ void Configure::generateQConfigCpp() + << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl + << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl ++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl + << " \"qt_targspec=" << targSpec << "\"," << endl + << " \"qt_hostspec=" << hostSpec << "\"," << endl + << "#endif" << endl +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 0000000000..03eb9d5820 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From 1dd6ee9bb2aafb8d77d9c7e465b9cf6d778bc283 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 4/6] 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-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 0000000000..13bfad452f --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 41ee07272cea21621c26ddeb02a3756e94b29f9a Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 5/6] 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-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 0000000000..875953411c --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,46 @@ +From 753924949e1d72c63283ecc904e2134fa76888d7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 876f657..0e094a8 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 8a636c7..0dad97c 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:force_independent:!exists($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb new file mode 100644 index 0000000000..ae81135b5f --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" +SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb new file mode 100644 index 0000000000..ae81135b5f --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" +SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb new file mode 100644 index 0000000000..2027336adb --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "55ab45a7a17db5b202b225603a35a37c" +SRC_URI[sha256sum] = "dcfcc6c0d1913d285dd7b42dd9bc457c304f3e3074a1e0d875fff1e9a8318520" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb new file mode 100644 index 0000000000..c5d5a742f3 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" +SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb new file mode 100644 index 0000000000..c5d5a742f3 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" +SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" From 6fb40c8d03266f647dfd71c50b18fb3086e47392 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 13:08:50 +0200 Subject: [PATCH 075/347] qt5-git: bump revision in git recipes to latest stable branch * there are important fixes in qtbase bootstrapping * create also own directory for patches, easier for many versions to coexist for now Signed-off-by: Martin Jansa --- .../{qt5-5.0.0+git.inc => qt5-5.0.2+git.inc} | 9 +- .../0001-Add-linux-oe-g-platform.patch | 303 ++++++++++++++++++ ...ow-to-set-qt.conf-from-the-outside-u.patch | 46 +++ .../0003-Add-external-hostbindir-option.patch | 219 +++++++++++++ ...ke-is-already-built-in-qtbase-native.patch | 30 ++ ...ding-a-separate-qmake-for-the-target.patch | 29 ++ ...tions-temporary-remove-isEmpty-check.patch | 47 +++ recipes-qt/qt5/qtbase-native_5.0.0+git.bb | 8 - recipes-qt/qt5/qtbase-native_5.0.2+git.bb | 6 + recipes-qt/qt5/qtbase_5.0.0+git.bb | 6 - recipes-qt/qt5/qtbase_5.0.2+git.bb | 6 + recipes-qt/qt5/qtdeclarative_5.0.0+git.bb | 6 - recipes-qt/qt5/qtdeclarative_5.0.2+git.bb | 6 + .../qt5/qtjsbackend-native_5.0.0+git.bb | 6 - .../qt5/qtjsbackend-native_5.0.2+git.bb | 6 + recipes-qt/qt5/qtjsbackend_5.0.0+git.bb | 6 - recipes-qt/qt5/qtjsbackend_5.0.2+git.bb | 6 + 17 files changed, 710 insertions(+), 35 deletions(-) rename recipes-qt/qt5/{qt5-5.0.0+git.inc => qt5-5.0.2+git.inc} (61%) create mode 100644 recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch create mode 100644 recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch create mode 100644 recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-native_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtbase-native_5.0.2+git.bb delete mode 100644 recipes-qt/qt5/qtbase_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.2+git.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.2+git.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.2+git.bb diff --git a/recipes-qt/qt5/qt5-5.0.0+git.inc b/recipes-qt/qt5/qt5-5.0.2+git.inc similarity index 61% rename from recipes-qt/qt5/qt5-5.0.0+git.inc rename to recipes-qt/qt5/qt5-5.0.2+git.inc index d44eeecfeb..df091dee41 100644 --- a/recipes-qt/qt5/qt5-5.0.0+git.inc +++ b/recipes-qt/qt5/qt5-5.0.2+git.inc @@ -1,18 +1,21 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2013 Martin Jansa # each module needs to define valid SRCREV SRC_URI += " \ - git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git;branch=stable \ + git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=stable \ " S = "${WORKDIR}/git" -PV = "5.0.0+git${SRCPV}" +PV = "5.0.2+git${SRCPV}" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch new file mode 100644 index 0000000000..0a0eca4318 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -0,0 +1,303 @@ +From 21001bb1c68fdc22ee243c562549f7b3a8a8ed84 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 15 Apr 2013 04:29:32 +0200 +Subject: [PATCH 1/6] 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 + +* 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: Pending + +Signed-off-by: Martin Jansa +--- + configure | 54 ++++++++++++++++--- + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ + 3 files changed, 186 insertions(+), 7 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 55a643a..666576f 100755 +--- a/configure ++++ b/configure +@@ -284,6 +284,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 +@@ -293,6 +303,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" + for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" +@@ -2847,7 +2879,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then + CFG_QGTKSTYLE=no + fi + +-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` ++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` + + TEST_COMPILER=$QMAKE_CONF_COMPILER + +@@ -2882,7 +2914,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 +@@ -3884,6 +3916,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..." +@@ -3922,11 +3962,11 @@ 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_CXXFLAGS +- setBootstrapVariable QMAKE_LFLAGS ++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CFLAGS ++ setBootstrapEvalVariable QMAKE_CXXFLAGS ++ setBootstrapEvalVariable QMAKE_LFLAGS + + if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then + setBootstrapVariable QMAKE_CFLAGS_RELEASE +diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf +new file mode 100644 +index 0000000..42966fe +--- /dev/null ++++ b/mkspecs/linux-oe-g++/qmake.conf +@@ -0,0 +1,39 @@ ++# ++# 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) ++ ++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 +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..d11081336b --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,46 @@ +From 80cdde4c31e6e5f534ca5e218b9b5cc5fd079b9a Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH 2/6] 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 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index 5fb9640..acd11f5 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -138,7 +138,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(); +@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + #endif + if (QFile::exists(qtconfig)) ++ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); + return new QSettings(qtconfig, QSettings::IniFormat); ++ printf("qt.conf wasn't found!!\n"); + return 0; //no luck + } + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch new file mode 100644 index 0000000000..b99eb1cf6b --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -0,0 +1,219 @@ +From e8fe1934151a47fd3ec86fb0054e137237fa69b7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 3/6] 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 + +Signed-off-by: Martin Jansa +--- + configure | 15 ++++++++++++++- + mkspecs/features/qt_functions.prf | 5 ++++- + mkspecs/features/qt_tool.prf | 2 +- + qmake/property.cpp | 1 + + qtbase.pro | 15 +++++++++++---- + src/corelib/global/qlibraryinfo.cpp | 3 ++- + src/corelib/global/qlibraryinfo.h | 1 + + tools/configure/configureapp.cpp | 8 ++++++++ + 8 files changed, 42 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 666576f..93dbfab 100755 +--- a/configure ++++ b/configure +@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" + QT_HOST_PREFIX= + QT_HOST_BINS= + QT_HOST_DATA= ++QT_EXTERNAL_HOST_BINS= + + #flags for SQL drivers + QT_CFLAGS_PSQL= +@@ -1141,7 +1142,7 @@ while [ "$#" -gt 0 ]; do + VAL=no + ;; + #Qt style options that pass an argument +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1326,6 +1327,9 @@ while [ "$#" -gt 0 ]; do + hostbindir) + QT_HOST_BINS="$VAL" + ;; ++ external-hostbindir) ++ QT_EXTERNAL_HOST_BINS="$VAL" ++ ;; + pkg-config) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PKGCONFIG="$VAL" +@@ -3180,6 +3184,11 @@ else + QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` + fi + ++# 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 ++ + #------------------------------------------------------------------------------- + # help - interactive parts of the script _after_ this section please + #------------------------------------------------------------------------------- +@@ -3346,6 +3355,9 @@ 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 +@@ -3855,6 +3867,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { + "qt_hpfxpath=$QT_HOST_PREFIX", + "qt_hbinpath=$QT_HOST_BINS", + "qt_hdatpath=$QT_HOST_DATA", ++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", + "qt_targspec=$shortxspec", + "qt_hostspec=$shortspec", + #endif +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 8cd2473..876f657 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { + defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { +- $$1 = $$[QT_HOST_BINS]/$$2 ++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 ++ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ $$1 = $$[QT_HOST_BINS]/$$2 ++ } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).bat) { + $$1 = $$eval($$1).bat +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 46d031f..5758604 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -37,7 +37,7 @@ load(qt_common) + # 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 + + MODULE_DEPENDS = $$replace(QT, -private$, ) +diff --git a/qmake/property.cpp b/qmake/property.cpp +index c4fbcd6..c1b7a9f 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -74,6 +74,7 @@ static const struct { + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, + { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, + { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, + { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, + { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, + }; +diff --git a/qtbase.pro b/qtbase.pro +index 4c41cff..997ea6d 100644 +--- a/qtbase.pro ++++ b/qtbase.pro +@@ -68,17 +68,24 @@ CONFIG -= qt + + #qmake + qmake.path = $$[QT_HOST_BINS] ++qmake.files = $$OUT_PWD/bin/qmake ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 + + #syncqt + syncqt.path = $$[QT_HOST_BINS] + syncqt.files = $$PWD/bin/syncqt +-equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt ++} ++equals(QMAKE_HOST.os, Windows) { ++ syncqt.files = $${syncqt.files}.bat ++} + INSTALLS += syncqt + + # If we are doing a prefix build, create a "module" pri which enables +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index acd11f5..bba0861 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() + */ + + static const struct { +- char key[19], value[13]; ++ char key[21], value[13]; + } qtConfEntries[] = { + { "Prefix", "." }, + { "Documentation", "doc" }, // should be ${Data}/doc +@@ -297,6 +297,7 @@ static const struct { + { "HostPrefix", "" }, + { "HostBinaries", "bin" }, + { "HostData", "." }, ++ { "ExternalHostBinaries", "" }, + { "TargetSpec", "" }, + { "HostSpec", "" }, + #endif +diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h +index 1a00a14..7e4829c 100644 +--- a/src/corelib/global/qlibraryinfo.h ++++ b/src/corelib/global/qlibraryinfo.h +@@ -83,6 +83,7 @@ public: + HostPrefixPath, + HostBinariesPath, + HostDataPath, ++ ExternalHostBinariesPath, + TargetSpecPath, + HostSpecPath, + LastHostPath = HostSpecPath, +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index dc11c0d..6d79631 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -1167,6 +1167,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_HOST_DATA" ] = 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) +@@ -3763,6 +3770,7 @@ void Configure::generateQConfigCpp() + << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl + << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl ++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl + << " \"qt_targspec=" << targSpec << "\"," << endl + << " \"qt_hostspec=" << hostSpec << "\"," << endl + << "#endif" << endl +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 0000000000..4b8dd91272 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From 915a980742cd072df6faa386daf3f937f5b5b215 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 4/6] 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 93dbfab..dd5e646 100755 +--- a/configure ++++ b/configure +@@ -3938,7 +3938,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-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 0000000000..6cc968bb78 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From f1246cedac44bfacb5a475d4ed247a3ac00c67d0 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 5/6] 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-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 0000000000..210e367dd1 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,47 @@ +From 6d1c296d6df2c5efd8aec3272e7eacae1c093885 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 3 +-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 876f657..0e094a8 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 5758604..37b50d4 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -36,8 +36,7 @@ load(qt_common) + + # 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):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { + isEmpty(MODULE):MODULE = $$TARGET + + MODULE_DEPENDS = $$replace(QT, -private$, ) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native_5.0.0+git.bb b/recipes-qt/qt5/qtbase-native_5.0.0+git.bb deleted file mode 100644 index 80d805656d..0000000000 --- a/recipes-qt/qt5/qtbase-native_5.0.0+git.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${PN}.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - -SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qtbase-native_5.0.2+git.bb b/recipes-qt/qt5/qtbase-native_5.0.2+git.bb new file mode 100644 index 0000000000..877067bf3e --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.0.2+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.2+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "8e127d9df868952d41c8aa622b6d4ead8139a835" diff --git a/recipes-qt/qt5/qtbase_5.0.0+git.bb b/recipes-qt/qt5/qtbase_5.0.0+git.bb deleted file mode 100644 index f5f010a321..0000000000 --- a/recipes-qt/qt5/qtbase_5.0.0+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qtbase_5.0.2+git.bb b/recipes-qt/qt5/qtbase_5.0.2+git.bb new file mode 100644 index 0000000000..877067bf3e --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.2+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.2+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "8e127d9df868952d41c8aa622b6d4ead8139a835" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb deleted file mode 100644 index 0ba6becd66..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "c8ef32e2b6cded37a6854b94a281464c1b7a298b" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb new file mode 100644 index 0000000000..5b8095d09e --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.2+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "4c94a3ca55e82ade19ff5d4ab361d40e6252f2da" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb deleted file mode 100644 index 48e2654e3b..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb new file mode 100644 index 0000000000..8a7e0d538b --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.2+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb deleted file mode 100644 index 48e2654e3b..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2+git.bb b/recipes-qt/qt5/qtjsbackend_5.0.2+git.bb new file mode 100644 index 0000000000..8a7e0d538b --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.2+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.2+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" From 861b62f51e6756ae7f3c2b0a6ce852e8a621fa6c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 13:26:26 +0200 Subject: [PATCH 076/347] qt5-versions.inc: add include file to select PREFERRED_VERSIONs of qt5 components --- conf/distro/include/qt5-versions.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/distro/include/qt5-versions.inc diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc new file mode 100644 index 0000000000..c7e4b376d6 --- /dev/null +++ b/conf/distro/include/qt5-versions.inc @@ -0,0 +1,10 @@ +# Select which version you prefer by defining QT5_VERSION and including this file +# possible values now "5.0.0", "5.0.1", "5.0.2", "5.0.2+git%" + +QT5_VERSION ?= "5.0.1" + +PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" +PREFERRED_VERSION_qtbase = "${QT5_VERSION}" +PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" +PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" +PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" From 40436b7fc9f0d699071191ca06ea70b1f2ee82e4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 21:59:04 +0200 Subject: [PATCH 077/347] qmake5_base: don't push AR to EXTRA_ENV * it overwrites value set from shell env in qmake.conf and ar is loosing cqs params mkspecs/linux-oe-g++/qmake.conf:QMAKE_AR = $(OE_QMAKE_AR) cqs Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3e757ab4ed..fdbb6cad76 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -13,7 +13,6 @@ EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${OE_QMAKE_AR}" \ STRIP="${OE_QMAKE_STRIP}" \ MAKE="make -e ${PARALLEL_MAKE}"' From def240608a0f08cd305f6dcdd9602994a92c9228 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 23:12:50 +0200 Subject: [PATCH 078/347] qmake5_base: add Plugins settings * otherwise plugins are installed in /lib/plugins --- classes/qmake5_base.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index fdbb6cad76..712575c9e6 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -43,6 +43,7 @@ Libraries = ${libdir} Headers = ${includedir}/${QT_DIR_NAME} Data = ${datadir}/${QT_DIR_NAME} ArchData = ${libdir}/${QT_DIR_NAME} +Plugins = ${libdir}/${QT_DIR_NAME}/plugins Documentation = ${docdir}/${QT_DIR_NAME} HostData = ${QMAKE_MKSPEC_PATH} EOF From 812c33e0c63ee3189ed5fdaac91f108712d7c5ef Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 23:13:20 +0200 Subject: [PATCH 079/347] qtbase: temporary disable target qmake build and add PN-mkspecs --- recipes-qt/qt5/qtbase.inc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f4462977ae..1754a24e88 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -84,23 +84,27 @@ do_configure_append() { do_compile_append() { # Build qmake for the target arch - cd ${S}/qmake - ${OE_QMAKE_QMAKE} - oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S} + # Disable for now, because doesn't work well with separate ${B} + # cd ${S}/qmake + # ${OE_QMAKE_QMAKE} + # oe_runmake CC="${CC}" CXX="${CXX}" + # cd ${S} } do_install_append() { ### Fix up the binaries to the right location ### TODO: FIX - install -d ${D}${bindir}/ - mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ - rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ - - # Install the right arch qmake - rm ${D}/${bindir}/qmake - install -m 0755 bin/qmake2 ${D}${bindir}/qmake + # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed + # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake') + rm -f ${D}/${bindir}/qmake + mv ${D}${B}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + TMP=`dirname ${D}/${B}/mkspecs` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done } -PACKAGES =. "${PN}-fonts " +PACKAGES =. "${PN}-fonts ${PN}-mkspecs " FILES_${PN}-fonts = "${libdir}/fonts" +FILES_${PN}-mkspecs = "${libdir}/${QT_DIR_NAME}/mkspecs" From 06ae6e8c9e7df5bbd8ae5ee19c841797c284b870 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Apr 2013 00:55:13 +0200 Subject: [PATCH 080/347] qtbase5_base: move binaries and libs to QT_DIR_NAME * mkspecs are now installed to libdir/${QT_DIR_NAME} * use the same qt.conf for all qtbase5_base, only qtbase-native is different now --- classes/qmake5_base.bbclass | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 712575c9e6..c2bccbfc48 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,7 +1,7 @@ # This is useful for target recipes to reference native mkspecs QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" -QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}/${QT_DIR_NAME}" QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds @@ -38,23 +38,15 @@ do_generate_qt_config_file() { cat > ${WORKDIR}/qt.conf <> ${WORKDIR}/qt.conf < Date: Tue, 23 Apr 2013 00:56:47 +0200 Subject: [PATCH 081/347] qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directories Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 27 +++++++++++++++++++++------ recipes-qt/qt5/qtbase.inc | 6 +++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 0bfe1ad4e3..286f918891 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -82,14 +82,29 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg " +PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg ${PN}-mkspecs " FILES_${PN}-tools = "${bindir}/*" FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}" FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*" -FILES_${PN}-dev += " \ - ${libdir}/cmake/* \ - ${libdir}/*.prl \ - ${includedir}/qt5/* \ - ${datadir}/qt5/* \ +FILES_${PN} += " \ + ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \ +" +FILES_${PN}-dev += " \ + ${libdir}/${QT_DIR_NAME}/pkgconfig \ + ${libdir}/${QT_DIR_NAME}/cmake/* \ + ${libdir}/${QT_DIR_NAME}/*.prl \ + ${libdir}/${QT_DIR_NAME}/*.la \ + ${datadir}/${QT_DIR_NAME}/* \ + ${includedir}/${QT_DIR_NAME}/* \ +" +FILES_${PN}-dbg += " \ + ${libdir}/${QT_DIR_NAME}/.debug \ + ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \ +" +FILES_${PN}-staticdev += " \ + ${libdir}/${QT_DIR_NAME}/*.a \ +" +FILES_${PN}-mkspecs += "\ + ${libdir}/${QT_DIR_NAME}/mkspecs \ " diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 1754a24e88..2664d2cba2 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -74,6 +74,7 @@ do_configure_append() { -importdir ${libdir}/${QT_DIR_NAME}/imports \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -hostbindir ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} \ -external-hostbindir ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} \ -platform ${OE_QMAKESPEC} \ -xplatform linux-oe-g++ \ @@ -105,6 +106,5 @@ do_install_append() { done } -PACKAGES =. "${PN}-fonts ${PN}-mkspecs " -FILES_${PN}-fonts = "${libdir}/fonts" -FILES_${PN}-mkspecs = "${libdir}/${QT_DIR_NAME}/mkspecs" +PACKAGES =. "${PN}-fonts " +FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts" From 9fddbb70bdc71c5aa7feb93e62fa9da45e1230cc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Apr 2013 00:58:55 +0200 Subject: [PATCH 082/347] qtjsbackend: Fix SEPB build and work around wrong mkspec install path Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 3ee101784b..13a5df51e4 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -11,7 +11,6 @@ INC_PR = "r0" inherit qmake5 SRC_URI += " \ - file://module_qmake.conf \ file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ " @@ -19,15 +18,18 @@ SRC_URI += " \ # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail PARALLEL_MAKE = "" -export QT_CONF_PATH="${WORKDIR}/qt.conf" - do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - # This should not be needed. Perhaps the lack of this file is an indication - # of an error on the native recipe... - cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf - - ${OE_QMAKE_QMAKE} -r -d + ${OE_QMAKE_QMAKE} -r -d ${S} +} + +do_install_append () { + mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done } From ea8d37c17dda7d9aa2e1a825b0bef492204bbb0f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Apr 2013 01:02:11 +0200 Subject: [PATCH 083/347] qtdeclarative: Fix SEPB build, remove module_qmake.conf Signed-off-by: Martin Jansa --- recipes-qt/qt5/files/module_qmake.conf | 1 - recipes-qt/qt5/qtdeclarative.inc | 12 +----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 recipes-qt/qt5/files/module_qmake.conf diff --git a/recipes-qt/qt5/files/module_qmake.conf b/recipes-qt/qt5/files/module_qmake.conf deleted file mode 100644 index 4285ae84b6..0000000000 --- a/recipes-qt/qt5/files/module_qmake.conf +++ /dev/null @@ -1 +0,0 @@ -load(qt_build_config) \ No newline at end of file diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 5746413407..e74ffd9119 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -10,21 +10,11 @@ INC_PR = "r0" inherit qmake5 -SRC_URI += " \ - file://module_qmake.conf \ -" - -export QT_CONF_PATH="${WORKDIR}/qt.conf" - do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - # This should not be needed. Perhaps the lack of this file is an indication - # of an error on the native recipe... - cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf - - ${OE_QMAKE_QMAKE} -r -d + ${OE_QMAKE_QMAKE} -r -d ${S} } do_install() { From 9b97567e9c527f0677e214268039808c15cdcc60 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Apr 2013 00:21:25 +0200 Subject: [PATCH 084/347] 5.0.2+git: bump SRCREVs a bit more * it's close to 5.1.0 --- recipes-qt/qt5/qtbase-native_5.0.2+git.bb | 2 +- recipes-qt/qt5/qtbase_5.0.2+git.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.2+git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native_5.0.2+git.bb b/recipes-qt/qt5/qtbase-native_5.0.2+git.bb index 877067bf3e..5e6f75aa09 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2+git.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.2+git.bb @@ -3,4 +3,4 @@ require qt5-5.0.2+git.inc PR = "${INC_PR}.0" -SRCREV = "8e127d9df868952d41c8aa622b6d4ead8139a835" +SRCREV = "3d42f6fed220cd0cd24924eb55db4b2751eed74c" diff --git a/recipes-qt/qt5/qtbase_5.0.2+git.bb b/recipes-qt/qt5/qtbase_5.0.2+git.bb index 877067bf3e..5e6f75aa09 100644 --- a/recipes-qt/qt5/qtbase_5.0.2+git.bb +++ b/recipes-qt/qt5/qtbase_5.0.2+git.bb @@ -3,4 +3,4 @@ require qt5-5.0.2+git.inc PR = "${INC_PR}.0" -SRCREV = "8e127d9df868952d41c8aa622b6d4ead8139a835" +SRCREV = "3d42f6fed220cd0cd24924eb55db4b2751eed74c" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb index 5b8095d09e..7b78390afb 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb @@ -3,4 +3,4 @@ require qt5-5.0.2+git.inc PR = "${INC_PR}.0" -SRCREV = "4c94a3ca55e82ade19ff5d4ab361d40e6252f2da" +SRCREV = "d054755e9e452df05fb590510d25bf4167b97af7" From e89e33fd173fc4006218e99ed363ca292d0a9644 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Apr 2013 20:54:26 +0200 Subject: [PATCH 085/347] qmake_base: remove QT_DIR_NAME from libdir * using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be installed in this prefix too * modify ArchData variable to move mkspecs files to qt5 prefix (so that they don't conflict with qt4) Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 6 +++--- recipes-qt/qt5/qtbase-native.inc | 1 + recipes-qt/qt5/qtbase.inc | 4 ++-- recipes-qt/qt5/qtjsbackend.inc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index c2bccbfc48..d114c54861 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,7 +1,7 @@ # This is useful for target recipes to reference native mkspecs -QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}" -QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}" QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds @@ -39,7 +39,7 @@ do_generate_qt_config_file() { [Paths] Prefix = ${prefix} Binaries = ${bindir}/${QT_DIR_NAME} -Libraries = ${libdir}/${QT_DIR_NAME} +Libraries = ${libdir} Headers = ${includedir}/${QT_DIR_NAME} Data = ${datadir}/${QT_DIR_NAME} ArchData = ${libdir}/${QT_DIR_NAME} diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 06320aae12..41531e524c 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -55,6 +55,7 @@ EXTRA_OECONF = " \ -release \ -prefix ${prefix} \ -bindir ${bindir}/${QT_DIR_NAME} \ + -libdir ${libdir} \ -headerdir ${includedir}/${QT_DIR_NAME} \ -archdatadir ${libdir}/${QT_DIR_NAME} \ -datadir ${datadir}/${QT_DIR_NAME} \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2664d2cba2..6925183527 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -65,7 +65,7 @@ do_configure_append() { -no-gcc-sysroot \ -prefix ${prefix} \ -bindir ${bindir}/${QT_DIR_NAME} \ - -libdir ${libdir}/${QT_DIR_NAME} \ + -libdir ${libdir} \ -datadir ${datadir}/${QT_DIR_NAME} \ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ -docdir ${docdir}/${QT_DIR_NAME} \ @@ -98,7 +98,7 @@ do_install_append() { # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake') rm -f ${D}/${bindir}/qmake - mv ${D}${B}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + mv ${D}${B}/mkspecs ${D}${libdir}/mkspecs TMP=`dirname ${D}/${B}/mkspecs` while test ${TMP} != ${D}; do rmdir ${TMP} diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 13a5df51e4..707e1da4b7 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -26,7 +26,7 @@ do_configure () { } do_install_append () { - mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/mkspecs TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs` while test ${TMP} != ${D}; do rmdir ${TMP} From af9d25bbe74ee31c5b7e8b22e5542c0cf5c38300 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Apr 2013 22:17:07 +0200 Subject: [PATCH 086/347] qtbase-native: Enable debug output from Makefile generation --- recipes-qt/qt5/qtbase-native.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 41531e524c..09f636f4a5 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -32,8 +32,8 @@ do_generate_qt_config_file() { # echo >> ${WORKDIR}/qt.conf } -#-dont-process EXTRA_OECONF = " \ + -dont-process \ -prefix ${prefix} \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ @@ -81,7 +81,7 @@ do_configure_prepend() { unset LD (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -# bin/qmake -r -d ${S} || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" + bin/qmake -d ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { From 09516373c0940b60c797a922b3b3206b82e01182 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:13:28 +0200 Subject: [PATCH 087/347] qmake: allow to disable debug output Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 5 ++++- recipes-qt/qt5/qtbase-native.inc | 2 +- recipes-qt/qt5/qtbase.inc | 4 ++-- recipes-qt/qt5/qtdeclarative.inc | 2 +- recipes-qt/qt5/qtjsbackend-native.inc | 2 +- recipes-qt/qt5/qtjsbackend.inc | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d114c54861..604397b136 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -8,9 +8,12 @@ QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++" OE_QMAKE_PLATFORM = "linux-oe-g++" +# Add -d to show debug output from every qmake call, but it prints *a lot* +OE_QMAKE_DEBUG_OUTPUT = "-d" + EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" -EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ +EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ STRIP="${OE_QMAKE_STRIP}" \ diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 09f636f4a5..03bb29fd4e 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -81,7 +81,7 @@ do_configure_prepend() { unset LD (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" - bin/qmake -d ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_install() { diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 6925183527..bc95d24407 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -79,8 +79,8 @@ do_configure_append() { -platform ${OE_QMAKESPEC} \ -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} - - ${OE_QMAKE_QMAKE} -r -d ${S} + + bin/qmake -r ${OE_QMAKE_DEBUG_OUTPUT} ${S} } do_compile_append() { diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index e74ffd9119..fc67e3e029 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -14,7 +14,7 @@ do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -r -d ${S} + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install() { diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 56bb854c11..ea5bd86d08 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -21,7 +21,7 @@ do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -d -r + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install() { diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 707e1da4b7..31eee80bd9 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -22,7 +22,7 @@ do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD - ${OE_QMAKE_QMAKE} -r -d ${S} + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } do_install_append () { From 38de259db85f43008db4bd2133791ee81f29a01c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:14:16 +0200 Subject: [PATCH 088/347] qtjsbackend-native: Use separate build directory Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index ea5bd86d08..25de8e60ea 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -17,7 +17,16 @@ SRC_URI += "\ # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail #PARALLEL_MAKE = "" +SEPB = "${WORKDIR}/build" +B = "${SEPB}" + do_configure() { + # Similar logic is in autotools.bbclass + if [ -d ${B} -a "${S}" != "${B}" ] ; then + # Existing separate build directory, exists, remove + rm -rf "${B}/*" + fi + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD From d2d5b7804e5e2c5895439faf22fb378329261830 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:16:27 +0200 Subject: [PATCH 089/347] qt5: package files with and without QT_DIR_NAME prefix * makes it easier to modify paths without QA warnings about unpackaged files Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 39 +++++++++++++++++++++++++++++++-------- recipes-qt/qt5/qtbase.inc | 2 +- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 286f918891..711ad45ee1 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -82,13 +82,30 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg ${PN}-mkspecs " -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}" -FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*" - +PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +FILES_${PN}-tools-dbg = " \ + ${bindir}/${QT_DIR_NAME}/.debug \ + ${bindir}/.debug \ +" +FILES_${PN}-plugins-dbg = " \ + ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/* \ + ${libdir}/plugins/*/.debug/* \ +" +FILES_${PN}-tools = " \ + ${bindir}/${QT_DIR_NAME}/* \ + ${bindir}/* \ +" +FILES_${PN}-plugins = " \ + ${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV} \ + ${libdir}/plugins/*/*${SOLIBSDEV} \ +" +FILES_${PN}-mkspecs += "\ + ${libdir}/${QT_DIR_NAME}/mkspecs \ + ${libdir}/mkspecs \ +" FILES_${PN} += " \ ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \ + ${libdir}/lib*${SOLIBS} \ " FILES_${PN}-dev += " \ ${libdir}/${QT_DIR_NAME}/pkgconfig \ @@ -97,14 +114,20 @@ FILES_${PN}-dev += " \ ${libdir}/${QT_DIR_NAME}/*.la \ ${datadir}/${QT_DIR_NAME}/* \ ${includedir}/${QT_DIR_NAME}/* \ + ${libdir}/pkgconfig \ + ${libdir}/cmake/* \ + ${libdir}/*.prl \ + ${libdir}/*.la \ + ${datadir}/* \ + ${includedir}/* \ " FILES_${PN}-dbg += " \ ${libdir}/${QT_DIR_NAME}/.debug \ ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \ + ${libdir}/.debug \ + ${libdir}/lib*${SOLIBSDEV} \ " FILES_${PN}-staticdev += " \ ${libdir}/${QT_DIR_NAME}/*.a \ -" -FILES_${PN}-mkspecs += "\ - ${libdir}/${QT_DIR_NAME}/mkspecs \ + ${libdir}/*.a \ " diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index bc95d24407..9487f7e97a 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -107,4 +107,4 @@ do_install_append() { } PACKAGES =. "${PN}-fonts " -FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts" +FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts" From 92705869f74b6e20ef006a2b9c79fbcdc9ff4a5b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:19:12 +0200 Subject: [PATCH 090/347] qtjsbackend: add .pri and .prl to SSTATE_SCAN_FILES Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native.inc | 2 ++ recipes-qt/qt5/qtjsbackend.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 25de8e60ea..b73311eeaa 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -5,6 +5,8 @@ DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" +SSTATE_SCAN_FILES += "*.pri *.prl" + INC_PR = "r0" inherit native qmake5_base diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 31eee80bd9..c1204543e1 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -8,6 +8,8 @@ DEPENDS = "qtbase qtjsbackend-native" INC_PR = "r0" +SSTATE_SCAN_FILES += "*.pri *.prl" + inherit qmake5 SRC_URI += " \ From b3abb65f6af9e6a48410f53d69444ffb026b39bb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:21:55 +0200 Subject: [PATCH 091/347] qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and libtool files * qt_module.prf replacements were creating -L/usr/lib in .pc files which is bad for cross-compilation * also use '=' for sysroot in libtool files Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 3 + recipes-qt/qt5/qtbase.inc | 3 + .../0003-Add-external-hostbindir-option.patch | 2 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 28 ++++++++ ...-qt_module-Fix-pkgconfig-replacement.patch | 67 +++++++++++++++++++ ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 30 +++++++++ 6 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 03bb29fd4e..e39604cf1e 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -17,6 +17,9 @@ SRC_URI += " \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0009-qt_module-Fix-pkgconfig-replacement.patch \ + file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ " SEPB = "${WORKDIR}/build" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 9487f7e97a..5b41bded56 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -7,6 +7,9 @@ SRC_URI += " \ file://0004-qmake-is-already-built-in-qtbase-native.patch \ file://0005-Allow-building-a-separate-qmake-for-the-target.patch \ file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0009-qt_module-Fix-pkgconfig-replacement.patch \ + file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index ba4badca12..338b1c32f2 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -118,7 +118,7 @@ index bbd4734..dca0c58 100644 { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, -+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, false }, { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 0000000000..b9f8cb733f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,28 @@ +From 1548dbf04ab1dbc45e514478fb82b4a0827140b1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 8/8] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +--- + 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 0e01ab5..6bb7986 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + if (!dictionary["XQMAKESPEC"].isEmpty() && !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; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 0000000000..e833cc5cf0 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,67 @@ +From 1120258fc6a60972523186e85c2c762b79e7a6c2 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 9/9] qt_module: Fix pkgconfig replacement + +* 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 + +Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 50e9469..9532377 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -191,18 +191,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$[QT_INSTALL_PREFIX/get] ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch new file mode 100644 index 0000000000..fcecc720d4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch @@ -0,0 +1,30 @@ +From b00e2fa5ade9bed1b75f4629cc7ba2c3ec9e429f Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:51:54 +0200 +Subject: [PATCH 10/10] qmake/property: rename QT_INSTALL_CONFIGURATION to + QT_INSTALL_SETTINGS + +* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS + property.cpp was only place using name QT_INSTALL_CONFIGURATION + +Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da +--- + qmake/property.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index dca0c58..8ebba3b 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -68,7 +68,7 @@ static const struct { + { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, + { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, + { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, +- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, ++ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, + { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, + { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, +-- +1.8.2.1 + From a5783e1a09bc8788b527b63ee3e8a8f489bf8ba5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:24:17 +0200 Subject: [PATCH 092/347] qtbase: Override all paths and export sysroot * otherwise sysroot from native build can leak to target build * missing paths like Qml2Imports were defaulting to devault /usr/qml * synchronize values between qt.conf and configure params --- classes/qmake5_base.bbclass | 16 +++++++--- recipes-qt/qt5/qtbase.inc | 62 +++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 604397b136..fa6f316652 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,7 +1,8 @@ # This is useful for target recipes to reference native mkspecs -QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}" +QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" +QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}/${QT_DIR_NAME}" -QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}" +QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds @@ -46,13 +47,20 @@ Libraries = ${libdir} Headers = ${includedir}/${QT_DIR_NAME} Data = ${datadir}/${QT_DIR_NAME} ArchData = ${libdir}/${QT_DIR_NAME} +LibraryExecutables = ${libdir}/${QT_DIR_NAME}/libexec +Imports = ${libdir}/${QT_DIR_NAME}/imports +Qml2Imports = ${libdir}/${QT_DIR_NAME}/qml Plugins = ${libdir}/${QT_DIR_NAME}/plugins Documentation = ${docdir}/${QT_DIR_NAME} -HostData = ${QMAKE_MKSPEC_PATH} +HostData = ${QMAKE_MKSPEC_PATH_TARGET} +HostBinaries = ${bindir}/${QT_DIR_NAME} +HostSpec = ${OE_QMAKESPEC} +TartgetSpec = ${OE_XQMAKESPEC} ExternalHostBinaries = ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} +Sysroot = ${STAGING_DIR_TARGET} EOF } - +# # Allows to override following values (as in version 5.0.1) # Prefix The default prefix for all paths. # Documentation The location for documentation upon install. diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5b41bded56..c11984770b 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -29,40 +29,43 @@ INC_PR = "r0" QT_BASE_NAME = "qt5" QT_DIR_NAME = "qt5" +SSTATE_SCAN_FILES += "*.pri *.prl" + # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" inherit qmake5 +do_generate_qt_config_file_append() { + UNDO_SYSROOT_PREFIX=`echo ${STAGING_DIR_TARGET} | sed 's#/[^/]*#../#g'` + cat >> ${WORKDIR}/qt.conf < ${WORKDIR}/qt.conf < Date: Sun, 28 Apr 2013 02:45:50 +0200 Subject: [PATCH 093/347] qtjsbackend: Use better patch to respect external-host-bindir * mkv8snapshot isn't in default PATH when it's in ${bindir}/${QT_DIR_NAME} Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 2 +- ...mkv8snapshot-tool-to-the-native-side.patch | 10 +++--- ...hat-we-pick-up-the-mkv8snapshot-tool.patch | 30 ------------------ ...espect-external-host-bindir-when-set.patch | 31 +++++++++++++++++++ 4 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch create mode 100644 recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index c1204543e1..69aad92251 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -13,7 +13,7 @@ SSTATE_SCAN_FILES += "*.pri *.prl" inherit qmake5 SRC_URI += " \ - file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ + file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ " # Bitbake will not respect the make order set by qmake and at times it will try to compile diff --git a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch index 556ece1470..f60e2a717e 100644 --- a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -1,14 +1,14 @@ -From d962ede7b874be21af636e07205cbb3866d82b27 Mon Sep 17 00:00:00 2001 +From 1539ddfc5f9c639554db98227c4d1de3b1f67792 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 11:20:13 -0800 -Subject: [PATCH] Install the mkv8snapshot tool to the native side +Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side Upstream-Status: Inappropriate [configuration] Signed-off-by: Mikko Levonmaa --- - src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro index 16beb02..5e327f7 100644 @@ -28,5 +28,5 @@ index 16beb02..5e327f7 100644 +INSTALLS += target + -- -1.7.4.1 +1.8.2.1 diff --git a/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch deleted file mode 100644 index 8ec57ebac2..0000000000 --- a/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3e07a136f42db68390cb9e20f5476e896f3bcd63 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 11:25:22 -0800 -Subject: [PATCH 2/2] Make sure that we pick up the mkv8snapshot tool - from the native sysroot - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - src/v8/v8.pro | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/v8/v8.pro b/src/v8/v8.pro -index 2be6a19..2478e5f 100644 ---- a/src/v8/v8.pro -+++ b/src/v8/v8.pro -@@ -25,7 +25,8 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. - include(v8.pri) - - contains(QT_CONFIG, v8snapshot) { -- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ #mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ mkv8snapshot.commands = mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} - DUMMY_FILE = v8.pro - mkv8snapshot.input = DUMMY_FILE - mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch new file mode 100644 index 0000000000..5ff08d2305 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch @@ -0,0 +1,31 @@ +From 79deac4cdb9d223ed22a989f1d3e86fc3504c78e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 02:45:01 +0200 +Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/v8/v8.pro | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/v8/v8.pro b/src/v8/v8.pro +index 2be6a19..d3da4e1 100644 +--- a/src/v8/v8.pro ++++ b/src/v8/v8.pro +@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. + include(v8.pri) + + contains(QT_CONFIG, v8snapshot) { +- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} ++ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() ++ !exists($$mkv8snapshot.tool): \ ++ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ++ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} + DUMMY_FILE = v8.pro + mkv8snapshot.input = DUMMY_FILE + mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp +-- +1.8.2.1 + From ca4c4eea5f28c85d1ba490c1f4bfbc605de8b205 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:54:48 +0200 Subject: [PATCH 094/347] qtjsbackend: Fix installation, now it's also prefixed with sysroot * like in qtbase Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 69aad92251..a7e956d883 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -28,8 +28,12 @@ do_configure () { } do_install_append () { - mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/mkspecs - TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs` + # everything except HostData and HostBinaries is prefixed with sysroot value, + # but we cannot remove sysroot override, because that's useful for pkg-config etc + cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} + rm -rf ${D}${STAGING_DIR_TARGET} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_TARGET}` while test ${TMP} != ${D}; do rmdir ${TMP} TMP=`dirname ${TMP}`; From e88c6945308a05366228a0946cb086bc6359c5eb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 03:01:25 +0200 Subject: [PATCH 095/347] qtdeclarative: Fix installation and packaging * now it's also prefixed with sysroot like in qtbase Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index fc67e3e029..3a277883e3 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -19,10 +19,31 @@ do_configure () { do_install() { oe_runmake install INSTALL_ROOT=${D} + # everything except HostData and HostBinaries is prefixed with sysroot value, + # but we cannot remove sysroot override, because that's useful for pkg-config etc + cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} + rm -rf ${D}${STAGING_DIR_TARGET} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_TARGET}` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done } -FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" -FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" -FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" +FILES_${PN}-qmlplugins-dbg = " \ + ${libdir}/${QT_DIR_NAME}/qml/*/.debug \ + ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \ + ${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug \ +" +FILES_${PN}-qmltooling-dbg = " \ + ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug/* \ +" +FILES_${PN}-qmlplugins = " \ + ${libdir}/${QT_DIR_NAME}/qml/* \ +" +FILES_${PN}-qmltooling = " \ + ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/* \ +" -PACKAGES .= "${PN}-qmlplugins ${PN}-qmltooling ${PN}-qmltooling-dbg" +PACKAGES .= " ${PN}-qmlplugins-dbg ${PN}-qmltooling-dbg ${PN}-qmlplugins ${PN}-qmltooling" From 783c97966478c6353fddb34f42044317d1355043 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:58:41 +0200 Subject: [PATCH 096/347] qtbase: Fix INCDIR/LIBDIR paths in .prl files --- recipes-qt/qt5/qtbase-native.inc | 1 + recipes-qt/qt5/qtbase.inc | 1 + ...11-qt_module-Fix-paths-in-.prl-files.patch | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index e39604cf1e..c682164197 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -20,6 +20,7 @@ SRC_URI += " \ file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ file://0009-qt_module-Fix-pkgconfig-replacement.patch \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ + file://0011-qt_module-Fix-paths-in-.prl-files.patch \ " SEPB = "${WORKDIR}/build" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index c11984770b..6cc4e9d401 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -10,6 +10,7 @@ SRC_URI += " \ file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ file://0009-qt_module-Fix-pkgconfig-replacement.patch \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ + file://0011-qt_module-Fix-paths-in-.prl-files.patch \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 0000000000..878ced6ba0 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,61 @@ +From 4af56553508993944e8ba6688c182d0e49eee1a1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 11/11] 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 + +Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 9532377..73053f7 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -195,17 +195,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + } +-- +1.8.2.1 + From 40cf08634741494df0c66fdfb151613b7ae29803 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:00:53 +0200 Subject: [PATCH 097/347] qtbase: Remove QT_DIR_NAME, QT_BASE_NAME * QT_DIR_NAME is set in qmake5_base * QT_BASE_NAME isn't used --- recipes-qt/qt5/qtbase-native.inc | 1 - recipes-qt/qt5/qtbase.inc | 3 --- 2 files changed, 4 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index c682164197..5f88130d2b 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -10,7 +10,6 @@ inherit native qmake5_base QT_MODULE = "qtbase" SSTATE_SCAN_FILES += "*.pri *.prl" -QT_DIR_NAME ?= "qt5" SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 6cc4e9d401..a5ac60cbc7 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -27,9 +27,6 @@ QT_MODULE_FLAGS = "-no-xcb" INC_PR = "r0" -QT_BASE_NAME = "qt5" -QT_DIR_NAME = "qt5" - SSTATE_SCAN_FILES += "*.pri *.prl" # Qt uses atomic instructions not supported in thumb mode From eed206da36737ab299599f87d8f3d08cb3838635 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:03:59 +0200 Subject: [PATCH 098/347] qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclass * penalty for more replacements is better then to forget to add this in some component which will also install .prl files --- classes/qmake5_base.bbclass | 3 +++ recipes-qt/qt5/qtbase-native.inc | 2 -- recipes-qt/qt5/qtbase.inc | 2 -- recipes-qt/qt5/qtjsbackend-native.inc | 2 -- recipes-qt/qt5/qtjsbackend.inc | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index fa6f316652..5f83d12d7d 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -12,6 +12,9 @@ OE_QMAKE_PLATFORM = "linux-oe-g++" # Add -d to show debug output from every qmake call, but it prints *a lot* OE_QMAKE_DEBUG_OUTPUT = "-d" +# Paths in .prl files contain SYSROOT value +SSTATE_SCAN_FILES += "*.pri *.prl" + EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 5f88130d2b..764e010e0d 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -9,8 +9,6 @@ inherit native qmake5_base QT_MODULE = "qtbase" -SSTATE_SCAN_FILES += "*.pri *.prl" - SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index a5ac60cbc7..f348c19ddd 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -27,8 +27,6 @@ QT_MODULE_FLAGS = "-no-xcb" INC_PR = "r0" -SSTATE_SCAN_FILES += "*.pri *.prl" - # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index b73311eeaa..25de8e60ea 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -5,8 +5,6 @@ DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" -SSTATE_SCAN_FILES += "*.pri *.prl" - INC_PR = "r0" inherit native qmake5_base diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index a7e956d883..9cbe9378f4 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -8,8 +8,6 @@ DEPENDS = "qtbase qtjsbackend-native" INC_PR = "r0" -SSTATE_SCAN_FILES += "*.pri *.prl" - inherit qmake5 SRC_URI += " \ From 3a91c4dc3db0ca4a87bf901202492484c3754ea5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:08:11 +0200 Subject: [PATCH 099/347] qt5: allow to change -release/-debug for some modules --- recipes-qt/qt5/qt5.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 711ad45ee1..a45c0aab08 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -33,9 +33,10 @@ QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" QT_TESTS ?= "-nomake tests" QT_EXAMPLES ?= "-nomake examples" QT_DEMOS ?= "-nomake demos" +QT_RELEASE ?= "-release" QT_CONFIG_FLAGS += " \ - -release \ + ${QT_RELEASE} \ -reduce-relocations \ -shared \ -silent \ From 54a6379be43dca503eb59b2dde48b7144e725f81 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:08:27 +0200 Subject: [PATCH 100/347] qtbase: remove some dead code --- recipes-qt/qt5/qtbase-native.inc | 1 - recipes-qt/qt5/qtbase.inc | 3 --- 2 files changed, 4 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 764e010e0d..8755e8108b 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -30,7 +30,6 @@ QT_CONF_PATH = "${B}/qt.conf" do_generate_qt_config_file() { : -# echo >> ${WORKDIR}/qt.conf } EXTRA_OECONF = " \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f348c19ddd..b3791ed679 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -33,12 +33,10 @@ ARM_INSTRUCTION_SET = "arm" inherit qmake5 do_generate_qt_config_file_append() { - UNDO_SYSROOT_PREFIX=`echo ${STAGING_DIR_TARGET} | sed 's#/[^/]*#../#g'` cat >> ${WORKDIR}/qt.conf < Date: Sun, 28 Apr 2013 13:09:31 +0200 Subject: [PATCH 101/347] qtjsbackend: remove PARALLEL_MAKE setting * it seems to work fine with modified v8.pro --- recipes-qt/qt5/qtjsbackend-native.inc | 4 ---- recipes-qt/qt5/qtjsbackend.inc | 4 ---- 2 files changed, 8 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 25de8e60ea..d627156c23 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -13,10 +13,6 @@ SRC_URI += "\ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " -# Bitbake will not respect the make order set by qmake and at times it will try to compile -# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail -#PARALLEL_MAKE = "" - SEPB = "${WORKDIR}/build" B = "${SEPB}" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 9cbe9378f4..64986396b5 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -14,10 +14,6 @@ SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ " -# Bitbake will not respect the make order set by qmake and at times it will try to compile -# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail -PARALLEL_MAKE = "" - do_configure () { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD From 7354b4ffe5662fa321f97f821974eff4dbb29679 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:25:51 +0200 Subject: [PATCH 102/347] qtjsbackend: Update LICENSE info Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native.inc | 8 ++++++-- recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 5 +++++ recipes-qt/qt5/qtjsbackend-native_5.0.1.bb | 5 +++++ recipes-qt/qt5/qtjsbackend.inc | 9 ++++++--- recipes-qt/qt5/qtjsbackend_5.0.0.bb | 5 +++++ recipes-qt/qt5/qtjsbackend_5.0.1.bb | 5 +++++ 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index d627156c23..cc8ef3f323 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -1,5 +1,9 @@ -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git +LICENSE = "LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +" DEPENDS = "qtbase-native" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb index a6b77fd6b8..3bcbbef98b 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -1,6 +1,11 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb index 3b64f8814d..a215e7abb5 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb @@ -1,6 +1,11 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 64986396b5..7d0dafd6c5 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -1,8 +1,11 @@ require qt5.inc -# FIXME!!! -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git +LICENSE = "LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +" DEPENDS = "qtbase qtjsbackend-native" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb index a6b77fd6b8..3bcbbef98b 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -1,6 +1,11 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb index 3b64f8814d..a215e7abb5 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.1.bb @@ -1,6 +1,11 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" From a0099515d277936814e5ed687dd5e3f4da552d29 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:30:26 +0200 Subject: [PATCH 103/347] qtdeclarative: Update LICENSE info * 5.0.2 and git recipes have the same LICENSE as qtbase (defined in qt5-${PV}.inc) Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 4 ---- recipes-qt/qt5/qtdeclarative_5.0.0.bb | 6 ++++++ recipes-qt/qt5/qtdeclarative_5.0.1.bb | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 3a277883e3..d77c484930 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,9 +1,5 @@ require qt5.inc -# FIXME!!! -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" - DEPENDS = "qtbase qtjsbackend" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb index fb37cb8760..996792cdc8 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -1,6 +1,12 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb index 99471681a4..1c33ea56a8 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.1.bb @@ -1,6 +1,12 @@ require ${PN}.inc require qt5-${PV}.inc +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78" From 45c98c921e56199abcfbcf59e5de2ee90500724f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:32:20 +0200 Subject: [PATCH 104/347] qt5: use consistent naming for LICENSE --- recipes-qt/qt5/qt5-5.0.0.inc | 2 +- recipes-qt/qt5/qt5-5.0.1.inc | 2 +- recipes-qt/qt5/qt5-5.0.2+git.inc | 2 +- recipes-qt/qt5/qt5-5.0.2.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc index 00b43f40bd..e155a207ec 100644 --- a/recipes-qt/qt5/qt5-5.0.0.inc +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -11,7 +11,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc index 00b43f40bd..e155a207ec 100644 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ b/recipes-qt/qt5/qt5-5.0.1.inc @@ -11,7 +11,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ diff --git a/recipes-qt/qt5/qt5-5.0.2+git.inc b/recipes-qt/qt5/qt5-5.0.2+git.inc index df091dee41..a9eff23f77 100644 --- a/recipes-qt/qt5/qt5-5.0.2+git.inc +++ b/recipes-qt/qt5/qt5-5.0.2+git.inc @@ -14,7 +14,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" DEFAULT_PREFERENCE = "-1" -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index e87f662d53..dc7bda1fcb 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -14,7 +14,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ From 2790c1607e3546447c871dbce7876d8bfd3bca25 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 13:38:49 +0200 Subject: [PATCH 105/347] qmake5: drop exports already exported in qmake5_base --- classes/qmake5.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 68c19f7fa4..4140eb5fb0 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,8 +6,6 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export OE_QMAKE_LINK = "${CXX}" -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" From 0a88f92505f27944e985c9f54e64c04b082778fb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 14:15:13 +0200 Subject: [PATCH 106/347] qtbase: refresh patches and add missing to 5.0.2 and git versions --- .../0001-Add-linux-oe-g-platform.patch | 2 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 4 +- .../0003-Add-external-hostbindir-option.patch | 2 +- ...ke-is-already-built-in-qtbase-native.patch | 2 +- ...ding-a-separate-qmake-for-the-target.patch | 2 +- ...tions-temporary-remove-isEmpty-check.patch | 2 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 30 +++++++++ ...-qt_module-Fix-pkgconfig-replacement.patch | 67 +++++++++++++++++++ ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 34 ++++++++++ ...11-qt_module-Fix-paths-in-.prl-files.patch | 61 +++++++++++++++++ .../0001-Add-linux-oe-g-platform.patch | 6 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 6 +- .../0003-Add-external-hostbindir-option.patch | 16 ++--- ...ke-is-already-built-in-qtbase-native.patch | 6 +- ...ding-a-separate-qmake-for-the-target.patch | 4 +- ...tions-temporary-remove-isEmpty-check.patch | 8 +-- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 ++++++++ ...-qt_module-Fix-pkgconfig-replacement.patch | 67 +++++++++++++++++++ ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 33 +++++++++ ...11-qt_module-Fix-paths-in-.prl-files.patch | 61 +++++++++++++++++ .../qtbase/0001-Add-linux-oe-g-platform.patch | 2 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 4 +- .../0003-Add-external-hostbindir-option.patch | 4 +- ...ke-is-already-built-in-qtbase-native.patch | 2 +- ...ding-a-separate-qmake-for-the-target.patch | 2 +- ...tions-temporary-remove-isEmpty-check.patch | 2 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 5 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 4 +- ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 7 +- ...11-qt_module-Fix-paths-in-.prl-files.patch | 2 +- 30 files changed, 431 insertions(+), 45 deletions(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch create mode 100644 recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch create mode 100644 recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index bdbdd9fcf3..7a6b1e7443 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From 9de9d0ccfacbac39d3eb171efe3e8c74a2417ae3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 1/6] Add linux-oe-g++ platform +Subject: [PATCH 01/11] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 5bcc22e702..1834beea10 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,8 +1,8 @@ From 41257668e0cb03056d79b2917d54a6e01bf2ed36 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 2/6] qlibraryinfo: allow to set qt.conf from the outside using - the environment +Subject: [PATCH 02/11] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index b31ebabe23..e44d738116 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 3/6] Add -external-hostbindir option +Subject: [PATCH 03/11] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch index 03eb9d5820..93cd334d97 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ From 1dd6ee9bb2aafb8d77d9c7e465b9cf6d778bc283 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 4/6] qmake is already built in qtbase-native +Subject: [PATCH 04/11] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch index 13bfad452f..3889ab13eb 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ From 41ee07272cea21621c26ddeb02a3756e94b29f9a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 5/6] Allow building a separate qmake for the target +Subject: [PATCH 05/11] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch index 875953411c..ff5bc0c184 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From 753924949e1d72c63283ecc904e2134fa76888d7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check +Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 0000000000..c7c418fde8 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,30 @@ +From c6909ce9ed3e65833ae835d89b346fbb158a1127 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 +Signed-off-by: Martin Jansa +--- + 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 cfc6f97..d0e17fa 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3087,8 +3087,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 0000000000..a9f66b7cb7 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,67 @@ +From 0bd37923dec93270066fc4362db7e443475a4b06 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement + +* 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 + +Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 1132943..7fbfd8d 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -128,18 +128,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch new file mode 100644 index 0000000000..d5a31acfcd --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch @@ -0,0 +1,34 @@ +From 10dde2fe0b7d8fe9ca7b4aa21d351b5dc01341c0 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:51:54 +0200 +Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to + QT_INSTALL_SETTINGS + +* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS + property.cpp was only place using name QT_INSTALL_CONFIGURATION + +Upstream-Status: Submitted +https://codereview.qt-project.org/54912 + +Change-Id: I0f3c3b5c0527d22c0171674710cdbb32f10e990f +Signed-off-by: Martin Jansa +--- + qmake/property.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index c1b7a9f..af2eacf 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -68,7 +68,7 @@ static const struct { + { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, + { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, + { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, +- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, ++ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, + { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, + { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 0000000000..1952308477 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,61 @@ +From 851960243212ffe0ac25d0fea236b7a8bc0e5dc5 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 11/11] 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 + +Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 7fbfd8d..226119f 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -132,17 +132,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 0a0eca4318..1b4ed74261 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 21001bb1c68fdc22ee243c562549f7b3a8a8ed84 Mon Sep 17 00:00:00 2001 +From 0cdd1297e98edd3368a6b923923ff6cf0684d800 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 1/6] Add linux-oe-g++ platform +Subject: [PATCH 01/11] 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 @@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 55a643a..666576f 100755 +index 9c86fa1..7dea731 100755 --- a/configure +++ b/configure @@ -284,6 +284,16 @@ getQMakeConf() diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index d11081336b..f14475978f 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,8 +1,8 @@ -From 80cdde4c31e6e5f534ca5e218b9b5cc5fd079b9a Mon Sep 17 00:00:00 2001 +From a256652b730e88566eb04dd7cdc39d5a1281c7fe Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 2/6] qlibraryinfo: allow to set qt.conf from the outside using - the environment +Subject: [PATCH 02/11] 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 diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index b99eb1cf6b..e1c56ac3a6 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ -From e8fe1934151a47fd3ec86fb0054e137237fa69b7 Mon Sep 17 00:00:00 2001 +From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 3/6] Add -external-hostbindir option +Subject: [PATCH 03/11] 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 @@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa 8 files changed, 42 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 666576f..93dbfab 100755 +index 7dea731..65f4d26 100755 --- a/configure +++ b/configure @@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" @@ -98,10 +98,10 @@ index 8cd2473..876f657 100644 exists($$eval($$1).bat) { $$1 = $$eval($$1).bat diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 46d031f..5758604 100644 +index 0a58880..c110ea5 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf -@@ -37,7 +37,7 @@ load(qt_common) +@@ -16,7 +16,7 @@ CONFIG += console # 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. @@ -189,10 +189,10 @@ index 1a00a14..7e4829c 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index dc11c0d..6d79631 100644 +index a18aac3..57409b1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1167,6 +1167,13 @@ void Configure::parseCmdLine() +@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine() dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); } @@ -206,7 +206,7 @@ index dc11c0d..6d79631 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3763,6 +3770,7 @@ void Configure::generateQConfigCpp() +@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp() << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch index 4b8dd91272..285c8a46be 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From 915a980742cd072df6faa386daf3f937f5b5b215 Mon Sep 17 00:00:00 2001 +From d0f322cf4ee9ead48997bb3e3a2c137bba91141b Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 4/6] qmake is already built in qtbase-native +Subject: [PATCH 04/11] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -13,7 +13,7 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 93dbfab..dd5e646 100755 +index 65f4d26..dbf99a9 100755 --- a/configure +++ b/configure @@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() diff --git a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch index 6cc968bb78..b239fd5bdb 100644 --- a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From f1246cedac44bfacb5a475d4ed247a3ac00c67d0 Mon Sep 17 00:00:00 2001 +From a6a15ff0150ca685909782f0ca861fa4336f33b3 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 5/6] Allow building a separate qmake for the target +Subject: [PATCH 05/11] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch index 210e367dd1..a2b1e5e8f7 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ -From 6d1c296d6df2c5efd8aec3272e7eacae1c093885 Mon Sep 17 00:00:00 2001 +From e356895802c2a1e596882c79161994ebbf361d65 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check +Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value @@ -29,10 +29,10 @@ index 876f657..0e094a8 100644 } contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 5758604..37b50d4 100644 +index c110ea5..34ee9ca 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf -@@ -36,8 +36,7 @@ load(qt_common) +@@ -15,8 +15,7 @@ CONFIG += console # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. diff --git a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 0000000000..90d6f75a04 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,29 @@ +From 6c494ea0e73c9ef60f45e7fdc0de40bb51ad5ac6 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Change-Id: I464c25888ab8b99ced6bd669b5c6448d491725a8 +--- + 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 57409b1..f443007 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 0000000000..67769b3357 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,67 @@ +From 72f1087fef0e506b9ab015498f5c7a4b3161c6f3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement + +* 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 + +Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 3531d28..1c43972 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -136,18 +136,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch new file mode 100644 index 0000000000..4fa772cde2 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch @@ -0,0 +1,33 @@ +From 6d816874a95cb85bdf96e06f763e21c098d92b89 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:51:54 +0200 +Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to + QT_INSTALL_SETTINGS + +* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS + property.cpp was only place using name QT_INSTALL_CONFIGURATION + +Upstream-Status: Submitted +https://codereview.qt-project.org/54912 + +Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da +--- + qmake/property.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qmake/property.cpp b/qmake/property.cpp +index c1b7a9f..af2eacf 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -68,7 +68,7 @@ static const struct { + { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, + { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, + { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, +- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, ++ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, + { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, + { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat + { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 0000000000..65fd4f5eef --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,61 @@ +From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 11/11] 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 + +Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 1c43972..feec2d5 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -140,17 +140,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 2d9d539b75..49244bef12 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From f5d5c9778031fbb807753c67133ddda35f9a0e30 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 1/6] Add linux-oe-g++ platform +Subject: [PATCH 01/11] 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 diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index f2a6efcaac..fc71a65325 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,8 +1,8 @@ From 29812cee9589dedd10a94b66ed5279549ed62f36 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 2/6] qlibraryinfo: allow to set qt.conf from the outside using - the environment +Subject: [PATCH 02/11] 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 diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 338b1c32f2..14d5d52ff8 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 3/6] Add -external-hostbindir option +Subject: [PATCH 03/11] 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 @@ -118,7 +118,7 @@ index bbd4734..dca0c58 100644 { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, -+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, false }, ++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch index 91709741c2..f934cf1d62 100644 --- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 4/6] qmake is already built in qtbase-native +Subject: [PATCH 04/11] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch index 4d16344383..af8eb463f0 100644 --- a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 5/6] Allow building a separate qmake for the target +Subject: [PATCH 05/11] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch index d1cacd3efe..ed238bcc8d 100644 --- a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check +Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index b9f8cb733f..3229e14ba1 100644 --- a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,9 +1,10 @@ -From 1548dbf04ab1dbc45e514478fb82b4a0827140b1 Mon Sep 17 00:00:00 2001 +From 4ba11842fa29ba28a05b3e8e511432fe360b4957 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 8/8] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT +Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 --- tools/configure/configureapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch index e833cc5cf0..0574ca89ff 100644 --- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 1120258fc6a60972523186e85c2c762b79e7a6c2 Mon Sep 17 00:00:00 2001 +From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 9/9] qt_module: Fix pkgconfig replacement +Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm diff --git a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch index fcecc720d4..7594058f5b 100644 --- a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch @@ -1,12 +1,15 @@ -From b00e2fa5ade9bed1b75f4629cc7ba2c3ec9e429f Mon Sep 17 00:00:00 2001 +From 5b01ec1b8da7fc949efea262647a9d6010c670f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/10] qmake/property: rename QT_INSTALL_CONFIGURATION to +Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to QT_INSTALL_SETTINGS * this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS property.cpp was only place using name QT_INSTALL_CONFIGURATION +Upstream-Status: Submitted +https://codereview.qt-project.org/54912 + Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da --- qmake/property.cpp | 2 +- diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch index 878ced6ba0..6eab1cb595 100644 --- a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch @@ -1,4 +1,4 @@ -From 4af56553508993944e8ba6688c182d0e49eee1a1 Mon Sep 17 00:00:00 2001 +From 1809b8b32d3b8a689eb5d40f096b3541345ff219 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 Subject: [PATCH 11/11] qt_module: Fix paths in .prl files From 7d3f0711eefea2aa60d6d5b1dc4aa2eec3c97098 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 15:16:18 +0200 Subject: [PATCH 107/347] qt5: move do_install modifications to shared qt5.inc and reuse do_configure --- recipes-qt/qt5/qt5.inc | 13 +++++++++++++ recipes-qt/qt5/qtbase.inc | 11 ----------- recipes-qt/qt5/qtdeclarative.inc | 19 +------------------ recipes-qt/qt5/qtjsbackend.inc | 18 +----------------- 4 files changed, 15 insertions(+), 46 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a45c0aab08..a4ac90b6ed 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -81,6 +81,19 @@ do_compile() { do_install() { oe_runmake install INSTALL_ROOT=${D} + + # everything except HostData and HostBinaries is prefixed with sysroot value, + # but we cannot remove sysroot override, because that's useful for pkg-config etc + if [ -d ${D}${STAGING_DIR_TARGET} ] ; then + cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} + rm -rf ${D}${STAGING_DIR_TARGET} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_TARGET}` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done + fi } PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b3791ed679..0a8b739781 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -105,17 +105,6 @@ do_install_append() { # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake') rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake - - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} - rm -rf ${D}${STAGING_DIR_TARGET} - # remove empty dirs - TMP=`dirname ${D}/${STAGING_DIR_TARGET}` - while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; - done } PACKAGES =. "${PN}-fonts " diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index d77c484930..9b82b22565 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -6,27 +6,10 @@ INC_PR = "r0" inherit qmake5 -do_configure () { - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD - +do_configure_append () { ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } -do_install() { - oe_runmake install INSTALL_ROOT=${D} - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} - rm -rf ${D}${STAGING_DIR_TARGET} - # remove empty dirs - TMP=`dirname ${D}/${STAGING_DIR_TARGET}` - while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; - done -} - FILES_${PN}-qmlplugins-dbg = " \ ${libdir}/${QT_DIR_NAME}/qml/*/.debug \ ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \ diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 7d0dafd6c5..66ab57b0e5 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -17,22 +17,6 @@ SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ " -do_configure () { - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD - +do_configure_append () { ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } - -do_install_append () { - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} - rm -rf ${D}${STAGING_DIR_TARGET} - # remove empty dirs - TMP=`dirname ${D}/${STAGING_DIR_TARGET}` - while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; - done -} From d4a726ccf6e9ab1272555161ae4eb69ea508652b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 15:19:00 +0200 Subject: [PATCH 108/347] qt5module.inc: move shared logic to new .inc file Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5module.inc | 9 +++++++++ recipes-qt/qt5/qtdeclarative.inc | 10 ++-------- recipes-qt/qt5/qtjsbackend.inc | 10 ++-------- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 recipes-qt/qt5/qt5module.inc diff --git a/recipes-qt/qt5/qt5module.inc b/recipes-qt/qt5/qt5module.inc new file mode 100644 index 0000000000..45053f0b52 --- /dev/null +++ b/recipes-qt/qt5/qt5module.inc @@ -0,0 +1,9 @@ +require qt5.inc + +DEPENDS += "qtbase" + +inherit qmake5 + +do_configure_append () { + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} +} diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 9b82b22565..b3b9007f24 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,15 +1,9 @@ -require qt5.inc +require qt5module.inc -DEPENDS = "qtbase qtjsbackend" +DEPENDS += "qtjsbackend" INC_PR = "r0" -inherit qmake5 - -do_configure_append () { - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} -} - FILES_${PN}-qmlplugins-dbg = " \ ${libdir}/${QT_DIR_NAME}/qml/*/.debug \ ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \ diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 66ab57b0e5..7ead9dde9a 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -1,4 +1,4 @@ -require qt5.inc +require qt5module.inc # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" @@ -7,16 +7,10 @@ LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " -DEPENDS = "qtbase qtjsbackend-native" +DEPENDS += "qtjsbackend-native" INC_PR = "r0" -inherit qmake5 - SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ " - -do_configure_append () { - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} -} From 18d2e711d87ffd8c6c341757d5810cef1d05dc39 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 22:30:58 +0200 Subject: [PATCH 109/347] qmake5_base: add qmake5_base_do_configure which allows to declare QMAKE_VARSUBST_* * don't export it, let recipe decide where to call it or even if it should be called (native recipes are not using it) Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 23 +++++++++++++++++++++++ recipes-qt/qt5/qt5.inc | 4 +++- recipes-qt/qt5/qt5module.inc | 6 ------ recipes-qt/qt5/qtbase.inc | 24 ++++++++++++++++++++---- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 5f83d12d7d..dd58dacf93 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -91,3 +91,26 @@ EOF # HostSpec The location where to install host mkspec addtask generate_qt_config_file after do_patch before do_configure + +qmake5_base_do_configure () { + if [ -z "${QMAKE_PROFILES}" ]; then + PROFILES="`ls ${S}/*.pro`" + else + PROFILES="${QMAKE_PROFILES}" + bbnote "qmake using profiles: '${QMAKE_PROFILES}'" + fi + + if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then + AFTER="-after" + QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" + bbnote "qmake postvar substitution: '${EXTRA_QMAKEVARS_POST}'" + fi + + if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then + QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" + bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'" + fi + + CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" + $CMD || die "Error calling $CMD" +} diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a4ac90b6ed..4e78577a1f 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -1,6 +1,6 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. -inherit qmake5_base +inherit qmake5 # Qt5 is dependent on icu for localization ICU = "icu " @@ -71,6 +71,8 @@ do_configure() { # Existing separate build directory, exists, remove rm -rf "${B}/*" fi + + qmake5_base_do_configure } do_compile() { diff --git a/recipes-qt/qt5/qt5module.inc b/recipes-qt/qt5/qt5module.inc index 45053f0b52..bbb05a6557 100644 --- a/recipes-qt/qt5/qt5module.inc +++ b/recipes-qt/qt5/qt5module.inc @@ -1,9 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -inherit qmake5 - -do_configure_append () { - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} -} diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 0a8b739781..531c88fe83 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -49,12 +49,28 @@ EXTRA_ENV = 'QMAKE="bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} -after \ # qtbase is exception, we need to use mkspecs from ${S} QMAKE_MKSPEC_PATH = "${B}" -do_configure_append() { +# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location +OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}" +OE_QMAKE_QMAKE = "bin/qmake" + +do_configure() { + set_arch + set_endian + + # Avoid problems with the linkers, since we want the linker to be g++ + unset LD + + # Similar logic is in autotools.bbclass + if [ -d ${B} -a "${S}" != "${B}" ] ; then + # Existing separate build directory, exists, remove + rm -rf "${B}/*" + fi + # we need symlink in path relative to source, because # EffectivePaths:Prefix is relative to qmake location if [ ! -e ${B}/bin/qmake ]; then mkdir ${B}/bin - ln -sf ${OE_QMAKE_QMAKE} ${B}/bin/qmake + ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake fi ${S}/configure -v \ @@ -83,8 +99,8 @@ do_configure_append() { -platform ${OE_QMAKESPEC} \ -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} - - bin/qmake -r ${OE_QMAKE_DEBUG_OUTPUT} ${S} + + qmake5_base_do_configure } do_compile_append() { From 66c091481cb3a8afdeb8422a1a997c5339392ae0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 22:44:42 +0200 Subject: [PATCH 110/347] qmake5_base: define variables for paths used by qmake in one place * makes it easier to change them, should be reused also in FILES_* variables * table of path variables and their different names available at https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE * all variables have OE_QMAKE_PATH_ prefix and then name from qmake varaible Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 52 +++++++++++++++++++++++--------- recipes-qt/qt5/qtbase-native.inc | 15 ++++----- recipes-qt/qt5/qtbase.inc | 36 +++++++++++----------- 3 files changed, 64 insertions(+), 39 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index dd58dacf93..0181edc072 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -38,28 +38,52 @@ export OE_QMAKE_STRIP = "echo" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" +OE_QMAKE_PATH_PREFIX = "${prefix}" +OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_LIBS = "${libdir}" +OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}" +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_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" +OE_QMAKE_PATH_DOCS = "${datadir}/${QT_DIR_NAME}/doc" +OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" +OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests" +OE_QMAKE_PATH_HOST_PREFIX = "" +OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" +OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" + # do not export STRIP to the environment STRIP[unexport] = "1" do_generate_qt_config_file() { cat > ${WORKDIR}/qt.conf < --- recipes-qt/qt5/{qt5-5.0.2+git.inc => qt5-git.inc} | 0 .../qt5/{qtbase-native_5.0.2+git.bb => qtbase-native_git.bb} | 2 +- recipes-qt/qt5/{qtbase_5.0.2+git.bb => qtbase_git.bb} | 2 +- .../qt5/{qtdeclarative_5.0.2+git.bb => qtdeclarative_git.bb} | 2 +- .../qt5/{qtjsbackend_5.0.2+git.bb => qtjsbackend-native_git.bb} | 2 +- .../qt5/{qtjsbackend-native_5.0.2+git.bb => qtjsbackend_git.bb} | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename recipes-qt/qt5/{qt5-5.0.2+git.inc => qt5-git.inc} (100%) rename recipes-qt/qt5/{qtbase-native_5.0.2+git.bb => qtbase-native_git.bb} (77%) rename recipes-qt/qt5/{qtbase_5.0.2+git.bb => qtbase_git.bb} (77%) rename recipes-qt/qt5/{qtdeclarative_5.0.2+git.bb => qtdeclarative_git.bb} (77%) rename recipes-qt/qt5/{qtjsbackend_5.0.2+git.bb => qtjsbackend-native_git.bb} (77%) rename recipes-qt/qt5/{qtjsbackend-native_5.0.2+git.bb => qtjsbackend_git.bb} (77%) diff --git a/recipes-qt/qt5/qt5-5.0.2+git.inc b/recipes-qt/qt5/qt5-git.inc similarity index 100% rename from recipes-qt/qt5/qt5-5.0.2+git.inc rename to recipes-qt/qt5/qt5-git.inc diff --git a/recipes-qt/qt5/qtbase-native_5.0.2+git.bb b/recipes-qt/qt5/qtbase-native_git.bb similarity index 77% rename from recipes-qt/qt5/qtbase-native_5.0.2+git.bb rename to recipes-qt/qt5/qtbase-native_git.bb index 5e6f75aa09..e4e18501c8 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2+git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,5 +1,5 @@ require ${PN}.inc -require qt5-5.0.2+git.inc +require qt5-git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.2+git.bb b/recipes-qt/qt5/qtbase_git.bb similarity index 77% rename from recipes-qt/qt5/qtbase_5.0.2+git.bb rename to recipes-qt/qt5/qtbase_git.bb index 5e6f75aa09..e4e18501c8 100644 --- a/recipes-qt/qt5/qtbase_5.0.2+git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,5 +1,5 @@ require ${PN}.inc -require qt5-5.0.2+git.inc +require qt5-git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb b/recipes-qt/qt5/qtdeclarative_git.bb similarity index 77% rename from recipes-qt/qt5/qtdeclarative_5.0.2+git.bb rename to recipes-qt/qt5/qtdeclarative_git.bb index 7b78390afb..f7d8dc2706 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2+git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,5 +1,5 @@ require ${PN}.inc -require qt5-5.0.2+git.inc +require qt5-git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2+git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb similarity index 77% rename from recipes-qt/qt5/qtjsbackend_5.0.2+git.bb rename to recipes-qt/qt5/qtjsbackend-native_git.bb index 8a7e0d538b..daf0cb2752 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_git.bb @@ -1,5 +1,5 @@ require ${PN}.inc -require qt5-5.0.2+git.inc +require qt5-git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb b/recipes-qt/qt5/qtjsbackend_git.bb similarity index 77% rename from recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb rename to recipes-qt/qt5/qtjsbackend_git.bb index 8a7e0d538b..daf0cb2752 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.2+git.bb +++ b/recipes-qt/qt5/qtjsbackend_git.bb @@ -1,5 +1,5 @@ require ${PN}.inc -require qt5-5.0.2+git.inc +require qt5-git.inc PR = "${INC_PR}.0" From d57e27ec08164d1c06e7f5169aa0fb23725f78b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 29 Apr 2013 11:59:52 +0200 Subject: [PATCH 112/347] qt5: Instead of fixing paths after installation, fix them in Makefile before * thanks to Mikko Levonmaa * move it from qt5.inc to qmake5_base.bbclass, because it can be useful for other apps too Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 23 +++++++++++++++++++++++ recipes-qt/qt5/qt5.inc | 15 +-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 0181edc072..42c3e9aeda 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -138,3 +138,26 @@ qmake5_base_do_configure () { CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" $CMD || die "Error calling $CMD" } + +qmake5_base_do_install() { + # Fix install paths for all + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" + + oe_runmake install INSTALL_ROOT=${D} + + # everything except HostData and HostBinaries is prefixed with sysroot value, + # but we cannot remove sysroot override, because that's useful for pkg-config etc + # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work, + # fix them manually + if [ -d ${D}${STAGING_DIR_TARGET} ] ; then + echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}" + cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} + rm -rf ${D}${STAGING_DIR_TARGET} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_TARGET}` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done + fi +} diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 4e78577a1f..474eee21a8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -82,20 +82,7 @@ do_compile() { } do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # everything except HostData and HostBinaries is prefixed with sysroot value, - # but we cannot remove sysroot override, because that's useful for pkg-config etc - if [ -d ${D}${STAGING_DIR_TARGET} ] ; then - cp -ra ${D}${STAGING_DIR_TARGET}/* ${D} - rm -rf ${D}${STAGING_DIR_TARGET} - # remove empty dirs - TMP=`dirname ${D}/${STAGING_DIR_TARGET}` - while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; - done - fi + qmake5_base_do_install } PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " From 92aba5ebafd80830b1ca5b3ff9ad34eea17d47cc Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 11:50:37 -0800 Subject: [PATCH 113/347] qt5-git: Provide a way to configure the git repo branch from a module Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-git.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index a9eff23f77..39e77f0927 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,9 +1,11 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. # Copyright (C) 2013 Martin Jansa +QT_MODULE_BRANCH ?= "stable" + # each module needs to define valid SRCREV SRC_URI += " \ - git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=stable \ + git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " S = "${WORKDIR}/git" From bbaf26aec2f2b64c2d061ab4c81773d569d99d4e Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 6 Mar 2013 12:20:37 -0800 Subject: [PATCH 114/347] qtbase: Find wayland-scanner correctly * Remove silent rules for wayland-scanner Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 3 + .../0001-Add-linux-oe-g-platform.patch | 14 ++-- ...wayland-scanner-disable-silent-rules.patch | 45 +++++++++++ .../0001-Add-linux-oe-g-platform.patch | 14 ++-- ...wayland-scanner-disable-silent-rules.patch | 81 +++++++++++++++++++ recipes-qt/qt5/qtbase-native.inc | 1 + recipes-qt/qt5/qtbase.inc | 1 + .../qtbase/0001-Add-linux-oe-g-platform.patch | 14 ++-- ...wayland-scanner-disable-silent-rules.patch | 45 +++++++++++ 9 files changed, 200 insertions(+), 18 deletions(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 42c3e9aeda..97faad9fc2 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -35,9 +35,12 @@ export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" +export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" +EXTRA_QMAKEVARS_PRE += "OE_QMAKE_WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner" + OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_LIBS = "${libdir}" diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index 7a6b1e7443..1cd7dd6088 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 9de9d0ccfacbac39d3eb171efe3e8c74a2417ae3 Mon Sep 17 00:00:00 2001 +From 231e94888c257da84bd39b138f5010c255387ae3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/11] Add linux-oe-g++ platform +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 @@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform Upstream-Status: Pending +Change-Id: I464fe8f17fa4ed4c80165183daf79b08fc491697 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 186 insertions(+), 7 deletions(-) + 3 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -149,10 +150,10 @@ index 2ea1ea4..6db4577 100755 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..42966fe +index 0000000..ca26b10 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -166,6 +167,7 @@ index 0000000..42966fe +# 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) + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 0000000000..1d2d35e590 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,45 @@ +From a74a1b5bc86553863b8dcbea7a7fde5642e73115 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 12/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 90e1e0f..0750849 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 1b4ed74261..1f328977cc 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 0cdd1297e98edd3368a6b923923ff6cf0684d800 Mon Sep 17 00:00:00 2001 +From 853b6920e9f10a29c5619b4239e960ad33080e8e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/11] Add linux-oe-g++ platform +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 @@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform Upstream-Status: Pending +Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 186 insertions(+), 7 deletions(-) + 3 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -149,10 +150,10 @@ index 9c86fa1..7dea731 100755 setBootstrapVariable QMAKE_CFLAGS_RELEASE diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..42966fe +index 0000000..ca26b10 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -166,6 +167,7 @@ index 0000000..42966fe +# 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) + diff --git a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 0000000000..ca55e62539 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,81 @@ +From db28b82f5a0deb14f57dcfe5c2743ec6b844b9aa Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 12/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 2ec064f..847d0f7 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES + wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES + wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES + wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code + + qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) +@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS + qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands ++#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-header + + qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES + qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp + qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands ++#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-code + + qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} +@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS + qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands ++#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-header + + qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES + qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp + qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands ++#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-code +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index f34e71cf55..9f7b0f719d 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -18,6 +18,7 @@ SRC_URI += " \ file://0009-qt_module-Fix-pkgconfig-replacement.patch \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ + file://0012-wayland-scanner-disable-silent-rules.patch \ " SEPB = "${WORKDIR}/build" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 500482cecf..80ce22f168 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -11,6 +11,7 @@ SRC_URI += " \ file://0009-qt_module-Fix-pkgconfig-replacement.patch \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ + file://0012-wayland-scanner-disable-silent-rules.patch \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 49244bef12..5907490ccf 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From f5d5c9778031fbb807753c67133ddda35f9a0e30 Mon Sep 17 00:00:00 2001 +From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/11] Add linux-oe-g++ platform +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 @@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform Upstream-Status: Pending +Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 186 insertions(+), 7 deletions(-) + 3 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -149,10 +150,10 @@ index 89246c8..0ab8eee 100755 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..42966fe +index 0000000..ca26b10 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -166,6 +167,7 @@ index 0000000..42966fe +# 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) + diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 0000000000..9431e79ea4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,45 @@ +From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 12/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 90e1e0f..0750849 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code +-- +1.8.2.1 + From 92881cd8a426b83153860fde6dd7d17c2958ee82 Mon Sep 17 00:00:00 2001 From: Heikki Paajanen Date: Mon, 11 Mar 2013 16:32:31 +0200 Subject: [PATCH 115/347] qtdeclarative: Fix flickable event handling * With isis2 touch mocking there is a situation where flickable doesn't process mouse events even if it has mouse grabbed. * Patch is cherry-picked from upstream. Signed-off-by: Heikki Paajanen Signed-off-by: Martin Jansa --- ...ug-when-flicking-twice-using-touches.patch | 39 +++++++++++++++++++ recipes-qt/qt5/qtdeclarative_5.0.0.bb | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch diff --git a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch b/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch new file mode 100644 index 0000000000..650e603ae2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch @@ -0,0 +1,39 @@ +From 27be7a832f017653ffda705407bb7a64246eda1f Mon Sep 17 00:00:00 2001 +From: Daniel d'Andrada +Date: Tue, 18 Dec 2012 10:51:21 -0200 +Subject: [PATCH] Flickable: Fix bug when flicking twice using touches + +When you flick twice in rapid succession, in the same direction, +the expected behavior is for flickable to be moving quite fast in the +direction of the flicks. + +But when you flicked using touch events instead of mouse ones, +the second flick caused Flickable to immediately halt. This change fixes it. + +Upstream-Status: Backport + +Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05 +Reviewed-by: Andras Becsi +--- + src/quick/items/qquickflickable.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp +index 6e5e6b7..88ef20f 100644 +--- a/src/quick/items/qquickflickable.cpp ++++ b/src/quick/items/qquickflickable.cpp +@@ -2038,6 +2038,11 @@ bool QQuickFlickable::sendMouseEvent(QQuickItem *item, QMouseEvent *event) + + QQuickWindow *c = window(); + QQuickItem *grabber = c ? c->mouseGrabberItem() : 0; ++ if (grabber == this && d->stealMouse) { ++ // we are already the grabber and we do want the mouse event to ourselves. ++ return true; ++ } ++ + bool grabberDisabled = grabber && !grabber->isEnabled(); + bool stealThisEvent = d->stealMouse; + if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) { +-- +1.7.9.5 + diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb index 996792cdc8..518f70d66a 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -7,7 +7,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ " -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +SRC_URI += " \ + file://0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch \ +" SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" From d0c0704464893b193962689b66a9d2d90b163f32 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 10:04:54 -0800 Subject: [PATCH 116/347] qtscript: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript.inc | 3 +++ recipes-qt/qt5/qtscript_5.0.0.bb | 13 +++++++++++++ recipes-qt/qt5/qtscript_git.bb | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 recipes-qt/qt5/qtscript.inc create mode 100644 recipes-qt/qt5/qtscript_5.0.0.bb create mode 100644 recipes-qt/qt5/qtscript_git.bb diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc new file mode 100644 index 0000000000..8c28b2b416 --- /dev/null +++ b/recipes-qt/qt5/qtscript.inc @@ -0,0 +1,3 @@ +require qt5module.inc + +INC_PR = "r0" diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb new file mode 100644 index 0000000000..8328271eef --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "0759bd132e46fb6d95451764018f3a92" +SRC_URI[sha256sum] = "8722e48c5f1f989ae920288fb4f5176ae5563775442d9f0aec1fc2e79869fb5f" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb new file mode 100644 index 0000000000..006dccf885 --- /dev/null +++ b/recipes-qt/qt5/qtscript_git.bb @@ -0,0 +1,19 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit 7a09d123cb29129419dea33c4e2ef0217b339a44 +# Author: Timo Jyrinki +# Date: Fri Feb 8 08:54:39 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# last tag before this SRCREV is 5.0.0 +PV = "5.0.0+git${SRCPV}" + +PR = "${INC_PR}.0" + +SRCREV = "e27e5bade2407e022f1814eaaf6cea8bb6741465" From feca032e52e61042c8032961673044e0e8f9707c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 12:01:16 -0800 Subject: [PATCH 117/347] qtxmlpatterns: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtxmlpatterns.inc | 4 ++++ recipes-qt/qt5/qtxmlpatterns_5.0.0.bb | 13 +++++++++++++ recipes-qt/qt5/qtxmlpatterns_git.bb | 19 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 recipes-qt/qt5/qtxmlpatterns.inc create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.0.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_git.bb diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc new file mode 100644 index 0000000000..1824f93d08 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns.inc @@ -0,0 +1,4 @@ +require qt5module.inc + +INC_PR = "r0" + diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb new file mode 100644 index 0000000000..bdb72f9f2d --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "5a76672bc411bb9cd1e0158d86706062" +SRC_URI[sha256sum] = "689d7d89fe71b8fba53183825294bc769ffe1a60dae4ccf5fa3ee6fe704b5172" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb new file mode 100644 index 0000000000..b0d69eb96e --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -0,0 +1,19 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit c79d19ae9d4feb353236db49381d8c6b9b032a4b +# Author: Timo Jyrinki +# Date: Thu Feb 7 17:59:12 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# last tag before this SRCREV is 5.0.0 +PV = "5.0.0+git${SRCPV}" + +PR = "${INC_PR}.0" + +SRCREV = "8a95cb56f5ecadb450de545061e8444e9698d21f" From 6600c47c668b597dfdce3675d60db851f3521af3 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 12:01:44 -0800 Subject: [PATCH 118/347] qt3d: Add recipe * MJ: Add license information not sure which parts (or maybe all) is under LICENSE.PREVIEW.COMMERCIAL * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 19 +++++++++++++++++++ recipes-qt/qt5/qt3d_git.bb | 11 +++++++++++ 2 files changed, 30 insertions(+) create mode 100644 recipes-qt/qt5/qt3d.inc create mode 100644 recipes-qt/qt5/qt3d_git.bb diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc new file mode 100644 index 0000000000..1ff4fe8470 --- /dev/null +++ b/recipes-qt/qt5/qt3d.inc @@ -0,0 +1,19 @@ +require qt5module.inc + +LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ + file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ + file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" + +INC_PR = "r1" + +FILES_${PN}-plugins += " \ + ${libdir}/${QT_DIR_NAME}/qml/Qt3D/libqthreedqmlplugin.so \ + ${libdir}/${QT_DIR_NAME}/qml/Qt3D/qmldir \ + ${libdir}/${QT_DIR_NAME}/qml/Qt3D/plugins.qmltypes \ + ${libdir}/${QT_DIR_NAME}/qml/Qt3D/Shapes \ +" +FILES_${PN}-plugins-dbg += " \ + ${libdir}/${QT_DIR_NAME}/qml/Qt3D/.debug \ +" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb new file mode 100644 index 0000000000..e33ce9f1e6 --- /dev/null +++ b/recipes-qt/qt5/qt3d_git.bb @@ -0,0 +1,11 @@ +require ${PN}.inc +require qt5-git.inc + +# last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +PR = "${INC_PR}.0" + +QT_MODULE_BRANCH = "master" + +SRCREV = "d723769d90331f4cde8dcb5aa3973e5c6bad8753" From aadfcfe9763bc13799621b4bd70b72e268b33e0c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 11:57:20 -0800 Subject: [PATCH 119/347] qtquick1: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquick1.inc | 14 ++++++++++++++ recipes-qt/qt5/qtquick1_5.0.0.bb | 13 +++++++++++++ recipes-qt/qt5/qtquick1_git.bb | 19 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 recipes-qt/qt5/qtquick1.inc create mode 100644 recipes-qt/qt5/qtquick1_5.0.0.bb create mode 100644 recipes-qt/qt5/qtquick1_git.bb diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc new file mode 100644 index 0000000000..7a38eabb30 --- /dev/null +++ b/recipes-qt/qt5/qtquick1.inc @@ -0,0 +1,14 @@ +require qt5module.inc + +DEPENDS += "qtscript" + +INC_PR = "r0" + +FILES_${PN}-plugins += " \ + ${libdir}/qt5/imports/builtins.qmltypes \ + ${libdir}/qt5/imports/Qt/labs/*/qmldir \ + ${libdir}/qt5/imports/Qt/labs/*/plugins.qmltypes \ + ${libdir}/qt5/imports/Qt/labs/*/*${SOLIBSDEV} \ +" + +FILES_${PN}-plugins-dbg += "${libdir}/qt5/imports/Qt/labs/*/.debug/*" diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb new file mode 100644 index 0000000000..e410022b32 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "04bc1ae59321676eb0239f8a3f9dcd95" +SRC_URI[sha256sum] = "3d0236546b1d2bdcfb2aa36091fd4cfbfaa64c89c69df9d6e4b7fa38a4c40504" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb new file mode 100644 index 0000000000..99c0159380 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -0,0 +1,19 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit 22e940b2c97364df12dbdfb51e9fc5a8eaf8d268 +# Author: Timo Jyrinki +# Date: Fri Feb 8 09:12:41 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# last tag before this SRCREV is 5.0.0 +PV = "5.0.0+git${SRCPV}" + +PR = "${INC_PR}.0" + +SRCREV = "be48320bb7213edf0fbca481650a0bc6cf203d30" From 92d465ece830b9d4ed83acc633e31d5efa1b2100 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 12:47:54 -0800 Subject: [PATCH 120/347] qtlocation: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation.inc | 5 +++++ recipes-qt/qt5/qtlocation_git.bb | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 recipes-qt/qt5/qtlocation.inc create mode 100644 recipes-qt/qt5/qtlocation_git.bb diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc new file mode 100644 index 0000000000..ae9cb0c42c --- /dev/null +++ b/recipes-qt/qt5/qtlocation.inc @@ -0,0 +1,5 @@ +require qt5module.inc + +DEPENDS += "qt3d qtdeclarative" + +INC_PR = "r0" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb new file mode 100644 index 0000000000..fb4d3fa654 --- /dev/null +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -0,0 +1,21 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit 54e6103798bb098bc9e83aa77decdad4868cb98e +# Author: Timo Jyrinki +# Date: Mon Feb 11 08:19:48 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +PR = "${INC_PR}.0" + +QT_MODULE_BRANCH = "master" + +SRCREV = "ac83b242c26d5b8750b6bf0f9ed0bac0e4569b6c" From db7467e72a8330b0b73546ff3f68e424aeea4b1c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 12:48:24 -0800 Subject: [PATCH 121/347] qtsensors: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsensors.inc | 14 ++++++++++++++ recipes-qt/qt5/qtsensors_git.bb | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 recipes-qt/qt5/qtsensors.inc create mode 100644 recipes-qt/qt5/qtsensors_git.bb diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc new file mode 100644 index 0000000000..9c8d15d712 --- /dev/null +++ b/recipes-qt/qt5/qtsensors.inc @@ -0,0 +1,14 @@ +require qt5module.inc + +DEPENDS += "qtdeclarative" + +INC_PR = "r0" + +FILES_${PN}-plugins += " \ + ${libdir}/${QT_DIR_NAME}/qml/QtSensors/qmldir \ + ${libdir}/${QT_DIR_NAME}/qml/QtSensors/plugins.qmltypes \ + ${libdir}/${QT_DIR_NAME}/qml/QtSensors/*${SOLIBSDEV} \ +" +FILES_${PN}-plugins-dbg += " \ + ${libdir}/${QT_DIR_NAME}/qml/QtSensors/.debug/* \ +" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb new file mode 100644 index 0000000000..f7d324fdc1 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -0,0 +1,19 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit cf831b83142dee8114df3bc37c29116a66945f5f +# Author: Timo Jyrinki +# Date: Mon Feb 11 08:56:35 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# qtsensors wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +PR = "${INC_PR}.0" + +SRCREV = "6323be3e2fc1b69145f37cda1d0214ec5fa3cb44" From fc0b7ec73ce6aa470b6666ad115f3d0e8b83a340 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 6 Mar 2013 12:31:29 -0800 Subject: [PATCH 122/347] qtwayland: Add recipe * Fix shader precision definition * MJ: Fix license information * MJ: Fix PV * MJ: add wayland-native to depends for wayland-scaner * MJ: add libxkbcommon to depends, but make it easy to remove it Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland.inc | 29 ++++++++ ...should-not-be-a-mandatory-dependency.patch | 41 +++++++++++ ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 33 +++++++++ ...eKHR-requires-the-context-to-be-NULL.patch | 71 +++++++++++++++++++ ...d-precision-qualifier-in-fragment-sh.patch | 31 ++++++++ recipes-qt/qt5/qtwayland_git.bb | 9 +++ 6 files changed, 214 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland.inc create mode 100644 recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch create mode 100644 recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch create mode 100644 recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch create mode 100644 recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch create mode 100644 recipes-qt/qt5/qtwayland_git.bb diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc new file mode 100644 index 0000000000..32fb08e96f --- /dev/null +++ b/recipes-qt/qt5/qtwayland.inc @@ -0,0 +1,29 @@ +require qt5module.inc + +LICENSE = "BSD & LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ + file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ +" + +# wayland-native is already in wayland DEPENDS, but add it here +# explicitly, because it's native wayland-scanner we're looking for +# libxkbcommon isn't mandatory with 0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +# make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't +# have libxkbcommon in oe-core). +XKB_DEPENDS = "libxkbcommon" +DEPENDS += "qtdeclarative wayland wayland-native ${XKB_DEPENDS}" + +INC_PR = "r1" + +SRC_URI += " \ + file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ + file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ + file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ + file://0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch \ +" + +QT_WAYLAND_CONFIG ?= "wayland-compositor" +QT_WAYLAND_DEFINES ?= "" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}" +EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}" diff --git a/recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch new file mode 100644 index 0000000000..e9e705cde6 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch @@ -0,0 +1,41 @@ +From c8417a2b0b66c26eaa0569c19422f87598e29629 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 19 Feb 2013 11:16:05 -0800 +Subject: [PATCH 1/4] xcbcommon should not be a mandatory dependency + +Not all platforms that use qtwayland depend on xcbcommon to be present +for them to be functional + +Change-Id: I899d9314bdf772a9d5b8b7c143636f9f12c8ad1d + +Signed-off-by: Martin Jansa +--- + qtwayland.pro | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/qtwayland.pro b/qtwayland.pro +index ee0e5ac..f1a6b6f 100644 +--- a/qtwayland.pro ++++ b/qtwayland.pro +@@ -11,15 +11,15 @@ qtCompileTest(xcomposite) + load(qt_parts) + + !config_wayland { +- error(QtWayland requires Wayland 1.0.0 or higher) ++ error("QtWayland requires Wayland 1.0.0 or higher") + } + + !config_xkbcommon { +- error(QtWayland requires xkbcommon 0.2.0 or higher) ++ warning("No xkbcommon 0.2.0 or higher found, disabling support for it") + } + + !config_wayland_scanner { +- error(QtWayland requires wayland-scanner) ++ error("QtWayland requires wayland-scanner") + } + + !config_wayland_egl { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch new file mode 100644 index 0000000000..0c9bbbe753 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch @@ -0,0 +1,33 @@ +From ae72fc41609c15293b1027ca3f2c4d712e4ae478 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Fri, 1 Mar 2013 13:00:53 -0800 +Subject: [PATCH 2/4] Temporarily patching this out as Qt5.0.0 does not have + qtHaveModule + +Signed-off-by: Martin Jansa +--- + src/compositor/compositor_api/compositor_api.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri +index f0bbe76..e7905e5 100644 +--- a/src/compositor/compositor_api/compositor_api.pri ++++ b/src/compositor/compositor_api/compositor_api.pri +@@ -12,7 +12,7 @@ SOURCES += \ + + QT += core-private + +-qtHaveModule(quick) { ++#qtHaveModule(quick) { + SOURCES += \ + compositor_api/qwaylandsurfaceitem.cpp \ + compositor_api/qwaylandsurfacenode.cpp \ +@@ -27,4 +27,4 @@ qtHaveModule(quick) { + + QT += qml quick + QT += quick-private gui-private +-} ++#} +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch new file mode 100644 index 0000000000..48eb870bcb --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch @@ -0,0 +1,71 @@ +From ca1f46a6192061e254deca1810d25ba423acb8de Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Wed, 6 Mar 2013 10:18:49 -0800 +Subject: [PATCH 3/4] eglCreateImageKHR requires the context to be NULL + +As per the EGL spec the context passed to that function should +be null. + +Signed-off-by: Martin Jansa +--- + .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +index 2a923ce..2be1e4c 100644 +--- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp ++++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +@@ -101,7 +101,6 @@ public: + + PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; + +- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; + }; + + WaylandEglIntegration::WaylandEglIntegration() +@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla + const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); + if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) + { +- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); +- if (!d->get_egl_context) { +- qWarning("Failed to retrieve the get_egl_context function"); +- } + d->egl_bind_wayland_display = + reinterpret_cast(eglGetProcAddress("eglBindWaylandDisplayWL")); + d->egl_unbind_wayland_display = +@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla + reinterpret_cast(eglGetProcAddress("glEGLImageTargetTexture2DOES")); + + if (d->egl_bind_wayland_display +- && d->get_egl_context + && d->egl_unbind_wayland_display + && d->egl_create_image + && d->egl_destroy_image +@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL + return 0; + } + +- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); +- EGLContext egl_context = d->get_egl_context(context); +- +- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, ++ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, + EGL_WAYLAND_BUFFER_WL, + buffer, NULL); + +@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC + { + Q_D(const WaylandEglIntegration); + +- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); +- EGLContext egl_context = d->get_egl_context(context); +- +- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, ++ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, + EGL_WAYLAND_BUFFER_WL, + buffer, NULL); + return image; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch b/recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch new file mode 100644 index 0000000000..47ea65fde5 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch @@ -0,0 +1,31 @@ +From 5c70644070803b665f64c2d3212b55a4a3270765 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Sun, 10 Mar 2013 11:29:38 -0700 +Subject: [PATCH 4/4] EGL: Specify vec2d precision qualifier in fragment shader + +GLSL does not specify a default precision qualifier here, so we have to +explicitly define it. Use highp, as it gets redefined to mediump by +QGLShaderProgram when not available. + +Signed-off-by: Daniel Stone +Signed-off-by: Martin Jansa +--- + src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp +index 4d8017d..a0ac6d9 100644 +--- a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp ++++ b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp +@@ -124,7 +124,7 @@ void QWaylandGLContext::swapBuffers(QPlatformSurface *surface) + gl_Position = position;\n\ + outTexCoords = texCoords.xy;\n\ + }"); +- m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying vec2 outTexCoords;\n\ ++ m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying highp vec2 outTexCoords;\n\ + uniform sampler2D texture;\n\ + void main()\n\ + {\n\ +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb new file mode 100644 index 0000000000..40e386bc8d --- /dev/null +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -0,0 +1,9 @@ +require ${PN}.inc +require qt5-git.inc + +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +PR = "${INC_PR}.1" + +SRCREV = "5cb159395eccb1d96fb73a78e499eef30aacb46d" From 37d0412e343cac16c06eb51bf47b5e72d14f852e Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 13 Mar 2013 15:11:30 -0700 Subject: [PATCH 123/347] qtgraphicaleffects: Add recipe * MJ: Add license information * MJ: Fix PV Signed-off-by: Martin Jansa Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtgraphicaleffects.inc | 12 ++++++++++++ recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb | 14 ++++++++++++++ recipes-qt/qt5/qtgraphicaleffects_git.bb | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 recipes-qt/qt5/qtgraphicaleffects.inc create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_git.bb diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc new file mode 100644 index 0000000000..874c6064fe --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects.inc @@ -0,0 +1,12 @@ +require qt5module.inc + +INC_PR = "r0" + +DEPENDS += "qtdeclarative" + +FILES_${PN} += " \ + ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/qmldir \ + ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/*.qml \ + ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/private/*.qml \ +" + diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb new file mode 100644 index 0000000000..7f5d182735 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb @@ -0,0 +1,14 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "1031f8021a2b2e3a2387d94103e8868e" +SRC_URI[sha256sum] = "e9cf71b4da1a1e879845f1fb1a532408ff6a0875e407a65d6bb3ce3dff0fe942" + diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb new file mode 100644 index 0000000000..783ffa3362 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -0,0 +1,19 @@ +require ${PN}.inc +require qt5-git.inc + +# LICENSE files are missing in this old SRCREV, remove when upgraded +# commit bd434a6ea358e96c373e3ad65bfb6d939904abf5 +# Author: Timo Jyrinki +# Date: Fri Feb 8 09:09:55 2013 +0200 +# Subject: Add license files mandated by (L)GPL. +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +# last tag before this SRCREV is 5.0.0 +PV = "5.0.0+git${SRCPV}" + +PR = "${INC_PR}.0" + +SRCREV = "9fb5dad66555c197ba19da6be80edf67e92888ba" From 188ff8fb52527ac338c0223350067948d14eca60 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 9 Jan 2013 14:44:21 -0800 Subject: [PATCH 124/347] qtbase: Disable mkv8snapshot * Disabling this for the time being as it generates invalid instructions when the target is arm. Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- .../qtbase/0004-Disable-mkv8snapshot.patch | 46 +++++++++++++++++++ recipes-qt/qt5/qtbase_5.0.0.bb | 2 + 2 files changed, 48 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch diff --git a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch new file mode 100644 index 0000000000..ae48373282 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch @@ -0,0 +1,46 @@ +From 2719aaabbf29a0f28638e5d67f4d68d548b593a7 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 8 Jan 2013 15:58:29 -0800 +Subject: [PATCH] Disable mkv8snapshot + +It seems to generate code that throws SIGILL, so disabling it + +Program received signal SIGILL, Illegal instruction. +0x26312c60 in ?? () +(gdb) bt + function=..., receiver=..., argc=1978934572, args=0x7efff254, + has_pending_exception=0x7efff277, qml=...) + at ../3rdparty/v8/src/execution.cc:125 + argc=1, argv=0x7efff254, pending_exception=0x7efff277, + convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 + receiver=, argc=, argv=, + pending_exception=0x7efff277, convert_receiver=false) + at ../3rdparty/v8/src/execution.cc:161 + data=, exc=0x7efff277) + at ../3rdparty/v8/src/execution.cc:734 + at ../3rdparty/v8/src/api.cc:4742 + at qml/v8/qv8contextwrapper.cpp:155 + ownership=) at qml/v8/qv8engine.cpp:155 + parent=) at qml/v8/qjsengine.cpp:192 + +Signed-off-by: Mikko Levonmaa +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 89246c8..b7d1cb5 100755 +--- a/configure ++++ b/configure +@@ -779,7 +779,7 @@ CFG_BUILD_PARTS="" + CFG_NOBUILD_PARTS="" + CFG_RELEASE_QMAKE=no + CFG_AUDIO_BACKEND=auto +-CFG_V8SNAPSHOT=auto ++CFG_V8SNAPSHOT=no + CFG_QML_DEBUG=yes + CFG_JAVASCRIPTCORE_JIT=auto + CFG_PKGCONFIG=auto +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb index d9c922d608..9a0d68bcbc 100644 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -3,5 +3,7 @@ require qt5-${PV}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0004-Disable-mkv8snapshot.patch" + SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" From 49fe70cda9cda9d73080751cb97a7719d04db056 Mon Sep 17 00:00:00 2001 From: Byungseon Shin Date: Tue, 16 Apr 2013 17:54:27 -0700 Subject: [PATCH 125/347] qtbase: Fix reentrancy problem in image reading * Fix GF-2779, by applying Upstream patch QTBUG-29281. Signed-off-by: Byungseon Shin Signed-off-by: Martin Jansa --- ...005-AddSynchoronization-qimagereader.patch | 37 +++++++++++++++++++ recipes-qt/qt5/qtbase_5.0.0.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch diff --git a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch b/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch new file mode 100644 index 0000000000..a16731a9f2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch @@ -0,0 +1,37 @@ +commit e28c03cb829c229209090d7939a9aba1af1fdea9 +Author: aavit +Date: Tue Feb 19 18:11:16 2013 +0100 + + Fix reentrancy problem in image reading + + There were race conditions when accessing the plugin factory and + the image reader plugins from different threads; ref QTBUG-29281. + Added a mutex lock to avoid. + + Change-Id: Ic1a3b6cbaf5603f1bcf7025b58247a9a3f6d08a9 + Reviewed-by: Samuel Rødal + +Upstream-Status: Backport (from 5.1.0) + +diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp +index 5eaf7bb..6847786 100644 +--- a/src/gui/image/qimagereader.cpp ++++ b/src/gui/image/qimagereader.cpp +@@ -133,6 +133,7 @@ + // factory loader + #include + #include ++#include + + // image handlers + #include +@@ -232,6 +233,9 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, + QByteArray suffix; + + #ifndef QT_NO_IMAGEFORMATPLUGIN ++ static QMutex mutex; ++ QMutexLocker locker(&mutex); ++ + typedef QMultiMap PluginKeyMap; + + // check if we have plugins that support the image format diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb index 9a0d68bcbc..a2a819e742 100644 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -4,6 +4,7 @@ require qt5-${PV}.inc PR = "${INC_PR}.0" SRC_URI += "file://0004-Disable-mkv8snapshot.patch" +SRC_URI += "file://0005-AddSynchoronization-qimagereader.patch" SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" From 12259a03ec15d898878dc8b125cdaa7ef15691b0 Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 18:34:31 -0500 Subject: [PATCH 126/347] qtsvg: Add module * MJ: simplified to use newer classes * MJ: Add license information Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsvg.inc | 3 +++ recipes-qt/qt5/qtsvg_5.0.0.bb | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 recipes-qt/qt5/qtsvg.inc create mode 100644 recipes-qt/qt5/qtsvg_5.0.0.bb diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc new file mode 100644 index 0000000000..8c28b2b416 --- /dev/null +++ b/recipes-qt/qt5/qtsvg.inc @@ -0,0 +1,3 @@ +require qt5module.inc + +INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb new file mode 100644 index 0000000000..16dd1338bb --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "2dbed5aeae30bd492a38ca230e69e038" +SRC_URI[sha256sum] = "be3674b5b058503ba90ae9138fec8de25c2e67a12059e937b3540e50a1ca08cf" From 935d55a0769ec9084ef780ac6f098ff07c57bfac Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 18:35:33 -0500 Subject: [PATCH 127/347] qtwebkit: Add module * MJ: simplified to use newer classes * MJ: Add license information * MJ: use OE_QMAKE_PATH_QML for packaging definition * MJ: add missing sqlite3 dependency Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 24 ++++++++++++++++++++++++ recipes-qt/qt5/qtwebkit_5.0.0.bb | 13 +++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit.inc create mode 100644 recipes-qt/qt5/qtwebkit_5.0.0.bb diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc new file mode 100644 index 0000000000..2100ee1664 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit.inc @@ -0,0 +1,24 @@ +require qt5module.inc + +DEPENDS += "qtdeclarative icu ruby-native sqlite3" + +INC_PR = "r0" + +do_configure_append() { + # Fix rpaths for QtWebProcess + find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${SEPB}/lib||g" +} + +PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" + +FILES_${PN}-qmlplugins = " \ + ${OE_QMAKE_PATH_QML}/QtWebKit/libqmlwebkitplugin.so \ + ${OE_QMAKE_PATH_QML}/QtWebKit/qmldir \ + ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so \ + ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/qmldir \ +" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/.debug \ + ${OE_QMAKE_PATH_QML}/QtWebKit/.debug \ +" diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb new file mode 100644 index 0000000000..8ec9cee7d8 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ + file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "11556c74161612fd37ce70277de3baa4" +SRC_URI[sha256sum] = "45981088d39ec044762861ee67acee8524ca20b13f1543a3045219aa9da21f9f" + From 3c0d8a8287b3e9ce8d02a1b808ded19e8aed0781 Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 20:33:01 -0500 Subject: [PATCH 128/347] qtmultimedia: Add module * MJ: simplified to use newer classes * MJ: Add license information * MJ: use OE_QMAKE_PATH_QML for packaging definition Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 18 ++++++++++++++++++ recipes-qt/qt5/qtmultimedia_5.0.0.bb | 13 +++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 recipes-qt/qt5/qtmultimedia.inc create mode 100644 recipes-qt/qt5/qtmultimedia_5.0.0.bb diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc new file mode 100644 index 0000000000..c22762252e --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -0,0 +1,18 @@ +require qt5module.inc + +DEPENDS += "qtdeclarative gstreamer alsa-lib " + +INC_PR = "r0" + +PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" + +FILES_${PN}-qmlplugins = " \ + ${OE_QMAKE_PATH_QML}/QtMultimedia/qmldir \ + ${OE_QMAKE_PATH_QML}/QtMultimedia/plugins.qmltypes \ + ${OE_QMAKE_PATH_QML}/QtMultimedia/Video.qml \ + ${OE_QMAKE_PATH_QML}/QtMultimedia/libdeclarative_multimedia.so \ +" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtMultimedia/.debug \ +" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb new file mode 100644 index 0000000000..2d703c5355 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "bc24e00ded809c0c457ff3480c6d4198" +SRC_URI[sha256sum] = "55915e30ba089dd6f9cd5e0dfe93e231c4d741da0f85a2e16d5a47f948424cc4" From 269ce3d01c4241cbff082ad339d42e7cd177b327 Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 21:14:01 -0500 Subject: [PATCH 129/347] qtimageformats: Add module * MJ: simplified to use newer classes * MJ: Add license information Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats.inc | 3 +++ recipes-qt/qt5/qtimageformats_5.0.0.bb | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 recipes-qt/qt5/qtimageformats.inc create mode 100644 recipes-qt/qt5/qtimageformats_5.0.0.bb diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc new file mode 100644 index 0000000000..8c28b2b416 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats.inc @@ -0,0 +1,3 @@ +require qt5module.inc + +INC_PR = "r0" diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb new file mode 100644 index 0000000000..21812a94fe --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.0.0.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "cf2955d48e5674bfad6def4dd3acacca" +SRC_URI[sha256sum] = "9280f13cdc58b02ab4562538fc381afa36df071564e0404a2ee48ecd0af659c6" From ce3f6c6f87d297490edfe898ab32e0fd87f8615f Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Sat, 5 Jan 2013 00:26:50 -0500 Subject: [PATCH 130/347] qtjsondb: Add module * MJ: fix PV * MJ: simplified to use newer classes * MJ: Add license information * MJ: use OE_QMAKE_PATH_QML for packaging definition Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsondb.inc | 22 ++++++++++++++++++++++ recipes-qt/qt5/qtjsondb_git.bb | 9 +++++++++ 2 files changed, 31 insertions(+) create mode 100644 recipes-qt/qt5/qtjsondb.inc create mode 100644 recipes-qt/qt5/qtjsondb_git.bb diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc new file mode 100644 index 0000000000..044608d51a --- /dev/null +++ b/recipes-qt/qt5/qtjsondb.inc @@ -0,0 +1,22 @@ +require qt5module.inc + +DEPENDS += "qtdeclarative icu" + +LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" +# this is for latest SRCREV: +LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \ + file://${S}/examples/jsondb-client/example.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \ + file://${S}/src/client/qjsondbglobal.h;endline=40;md5=34f5660524f0d70941d0416511ef49a0 \ +" + +INC_PR = "r0" + +PACKAGES += "${PN}-qmlplugins ${PN}-qmlplugins-dbg" + +FILES_${PN}-qmlplugins = " \ + ${OE_QMAKE_PATH_QML}/QtJsonDb/qmldir \ + ${OE_QMAKE_PATH_QML}/QtJsonDb/libjsondbplugin.so \ +" +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtJsonDb/.debug \ +" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb new file mode 100644 index 0000000000..8e9bebe670 --- /dev/null +++ b/recipes-qt/qt5/qtjsondb_git.bb @@ -0,0 +1,9 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +# qtjsondb wasn't released yet, last tag before this SRCREV isn't even 5.0.0-beta1, but lets use it for now +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +SRCREV = "c7c1e61bb5beddc3f4502548fd9ee498f1534e67" From 6bc9ccfa0101ec07f8ae8a86a049cd2c6766bd48 Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 23:44:39 -0500 Subject: [PATCH 131/347] qtsystems: Add module * MJ: fix PV * MJ: simplified to use newer classes * MJ: Add license information * MJ: use OE_QMAKE_PATH_QML for packaging definition Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsystems.inc | 24 ++++++++++++++++++++++++ recipes-qt/qt5/qtsystems_git.bb | 9 +++++++++ 2 files changed, 33 insertions(+) create mode 100644 recipes-qt/qt5/qtsystems.inc create mode 100644 recipes-qt/qt5/qtsystems_git.bb diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc new file mode 100644 index 0000000000..5159c686c7 --- /dev/null +++ b/recipes-qt/qt5/qtsystems.inc @@ -0,0 +1,24 @@ +require qt5module.inc + +DEPENDS += "qtdeclarative qtjsondb udev bluez4 gconf" + +LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" +# LICENSE files are missing in 5.0.0 +LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=40;md5=f28e1baba502dda6849d69d5c24e7356 \ + file://${S}/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \ + file://${S}/doc/src/systeminfo/systeminfo.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \ +" + +INC_PR = "r0" + +PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" + +FILES_${PN}-qmlplugins = " \ + ${OE_QMAKE_PATH_QML}/*/*.so \ + ${OE_QMAKE_PATH_QML}/*/qmldir \ + ${OE_QMAKE_PATH_QML}/*/plugins.qmltypes \ +" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/*/.debug \ +" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb new file mode 100644 index 0000000000..4b7f6acb83 --- /dev/null +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -0,0 +1,9 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +SRCREV = "2dbaae64ccd0fa3646d68d77cbc9baac7d3bde2e" From 370bbaf80e4b9068c32bbd86b452d4cd2128723e Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Fri, 4 Jan 2013 18:35:10 -0500 Subject: [PATCH 132/347] qtdeclarative: Add qtsvg and qtxmlpatterns to depends Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index b3b9007f24..a4f0692e71 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,6 +1,6 @@ require qt5module.inc -DEPENDS += "qtjsbackend" +DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" INC_PR = "r0" From bd10121a0d226e18640f21ef20f490f7569575fb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 14:47:48 +0200 Subject: [PATCH 133/347] qt5: add PN-qmlplugins packages and remove them from modules, use OE_QMAKE_PATH_* variables * qml and imports go to PN-qmlplugins * all other plugins go to just PN-plugins Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 10 --- recipes-qt/qt5/qt5.inc | 93 ++++++++++++++++++--------- recipes-qt/qt5/qtdeclarative.inc | 17 ----- recipes-qt/qt5/qtgraphicaleffects.inc | 9 +-- recipes-qt/qt5/qtjsondb.inc | 10 --- recipes-qt/qt5/qtmultimedia.inc | 13 ---- recipes-qt/qt5/qtquick1.inc | 9 --- recipes-qt/qt5/qtsensors.inc | 9 --- recipes-qt/qt5/qtsystems.inc | 12 ---- recipes-qt/qt5/qtwebkit.inc | 14 ---- recipes-qt/qt5/qtxmlpatterns.inc | 1 - 11 files changed, 62 insertions(+), 135 deletions(-) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 1ff4fe8470..92b2628a6c 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -7,13 +7,3 @@ LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" INC_PR = "r1" - -FILES_${PN}-plugins += " \ - ${libdir}/${QT_DIR_NAME}/qml/Qt3D/libqthreedqmlplugin.so \ - ${libdir}/${QT_DIR_NAME}/qml/Qt3D/qmldir \ - ${libdir}/${QT_DIR_NAME}/qml/Qt3D/plugins.qmltypes \ - ${libdir}/${QT_DIR_NAME}/qml/Qt3D/Shapes \ -" -FILES_${PN}-plugins-dbg += " \ - ${libdir}/${QT_DIR_NAME}/qml/Qt3D/.debug \ -" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 474eee21a8..a748d89682 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -85,52 +85,81 @@ do_install() { qmake5_base_do_install } -PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " + +# extra -dbg packages +FILES_${PN}-qmlplugins-dbg = " \ + ${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 \ +" FILES_${PN}-tools-dbg = " \ - ${bindir}/${QT_DIR_NAME}/.debug \ - ${bindir}/.debug \ + ${OE_QMAKE_PATH_BINS}/.debug \ " FILES_${PN}-plugins-dbg = " \ - ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/* \ - ${libdir}/plugins/*/.debug/* \ + ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \ +" + +# extra packages +# qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} +FILES_${PN}-qmlplugins = " \ + ${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_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_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 \ + ${OE_QMAKE_PATH_IMPORTS}/*/qmldir \ + ${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 \ " FILES_${PN}-tools = " \ - ${bindir}/${QT_DIR_NAME}/* \ - ${bindir}/* \ + ${OE_QMAKE_PATH_BINS}/* \ " FILES_${PN}-plugins = " \ - ${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV} \ - ${libdir}/plugins/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_PLUGINS}/*/*${SOLIBSDEV} \ " -FILES_${PN}-mkspecs += "\ - ${libdir}/${QT_DIR_NAME}/mkspecs \ - ${libdir}/mkspecs \ +FILES_${PN}-mkspecs = "\ + ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ " + +# modifications to normal packages FILES_${PN} += " \ - ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \ - ${libdir}/lib*${SOLIBS} \ + ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \ + ${OE_QMAKE_PATH_LIBEXECS} \ " FILES_${PN}-dev += " \ - ${libdir}/${QT_DIR_NAME}/pkgconfig \ - ${libdir}/${QT_DIR_NAME}/cmake/* \ - ${libdir}/${QT_DIR_NAME}/*.prl \ - ${libdir}/${QT_DIR_NAME}/*.la \ - ${datadir}/${QT_DIR_NAME}/* \ - ${includedir}/${QT_DIR_NAME}/* \ - ${libdir}/pkgconfig \ - ${libdir}/cmake/* \ - ${libdir}/*.prl \ - ${libdir}/*.la \ - ${datadir}/* \ - ${includedir}/* \ + ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_LIBS}/pkgconfig \ + ${OE_QMAKE_PATH_LIBS}/cmake/* \ + ${OE_QMAKE_PATH_LIBS}/*.prl \ + ${OE_QMAKE_PATH_LIBS}/*.la \ + ${OE_QMAKE_PATH_DATA}/* \ + ${OE_QMAKE_PATH_HEADERS}/* \ " FILES_${PN}-dbg += " \ - ${libdir}/${QT_DIR_NAME}/.debug \ - ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \ - ${libdir}/.debug \ - ${libdir}/lib*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_LIBS}/.debug \ + ${OE_QMAKE_PATH_LIBEXECS}/.debug \ " FILES_${PN}-staticdev += " \ - ${libdir}/${QT_DIR_NAME}/*.a \ - ${libdir}/*.a \ + ${OE_QMAKE_PATH_LIBS}/*.a \ " diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index a4f0692e71..8cb21ff13c 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -3,20 +3,3 @@ require qt5module.inc DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" INC_PR = "r0" - -FILES_${PN}-qmlplugins-dbg = " \ - ${libdir}/${QT_DIR_NAME}/qml/*/.debug \ - ${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \ - ${libdir}/${QT_DIR_NAME}/qml/*/*/*/.debug \ -" -FILES_${PN}-qmltooling-dbg = " \ - ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug/* \ -" -FILES_${PN}-qmlplugins = " \ - ${libdir}/${QT_DIR_NAME}/qml/* \ -" -FILES_${PN}-qmltooling = " \ - ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/* \ -" - -PACKAGES .= " ${PN}-qmlplugins-dbg ${PN}-qmltooling-dbg ${PN}-qmlplugins ${PN}-qmltooling" diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index 874c6064fe..a6b0fe9dfe 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc @@ -1,12 +1,5 @@ require qt5module.inc -INC_PR = "r0" - DEPENDS += "qtdeclarative" -FILES_${PN} += " \ - ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/qmldir \ - ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/*.qml \ - ${libdir}/${QT_DIR_NAME}/qml/QtGraphicalEffects/private/*.qml \ -" - +INC_PR = "r0" diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc index 044608d51a..887b2610bd 100644 --- a/recipes-qt/qt5/qtjsondb.inc +++ b/recipes-qt/qt5/qtjsondb.inc @@ -10,13 +10,3 @@ LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130 " INC_PR = "r0" - -PACKAGES += "${PN}-qmlplugins ${PN}-qmlplugins-dbg" - -FILES_${PN}-qmlplugins = " \ - ${OE_QMAKE_PATH_QML}/QtJsonDb/qmldir \ - ${OE_QMAKE_PATH_QML}/QtJsonDb/libjsondbplugin.so \ -" -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/QtJsonDb/.debug \ -" diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index c22762252e..c2003fdd2e 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -3,16 +3,3 @@ require qt5module.inc DEPENDS += "qtdeclarative gstreamer alsa-lib " INC_PR = "r0" - -PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" - -FILES_${PN}-qmlplugins = " \ - ${OE_QMAKE_PATH_QML}/QtMultimedia/qmldir \ - ${OE_QMAKE_PATH_QML}/QtMultimedia/plugins.qmltypes \ - ${OE_QMAKE_PATH_QML}/QtMultimedia/Video.qml \ - ${OE_QMAKE_PATH_QML}/QtMultimedia/libdeclarative_multimedia.so \ -" - -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/QtMultimedia/.debug \ -" diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index 7a38eabb30..8befa81350 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc @@ -3,12 +3,3 @@ require qt5module.inc DEPENDS += "qtscript" INC_PR = "r0" - -FILES_${PN}-plugins += " \ - ${libdir}/qt5/imports/builtins.qmltypes \ - ${libdir}/qt5/imports/Qt/labs/*/qmldir \ - ${libdir}/qt5/imports/Qt/labs/*/plugins.qmltypes \ - ${libdir}/qt5/imports/Qt/labs/*/*${SOLIBSDEV} \ -" - -FILES_${PN}-plugins-dbg += "${libdir}/qt5/imports/Qt/labs/*/.debug/*" diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc index 9c8d15d712..a6b0fe9dfe 100644 --- a/recipes-qt/qt5/qtsensors.inc +++ b/recipes-qt/qt5/qtsensors.inc @@ -3,12 +3,3 @@ require qt5module.inc DEPENDS += "qtdeclarative" INC_PR = "r0" - -FILES_${PN}-plugins += " \ - ${libdir}/${QT_DIR_NAME}/qml/QtSensors/qmldir \ - ${libdir}/${QT_DIR_NAME}/qml/QtSensors/plugins.qmltypes \ - ${libdir}/${QT_DIR_NAME}/qml/QtSensors/*${SOLIBSDEV} \ -" -FILES_${PN}-plugins-dbg += " \ - ${libdir}/${QT_DIR_NAME}/qml/QtSensors/.debug/* \ -" diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index 5159c686c7..2c6d144ba2 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc @@ -10,15 +10,3 @@ LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=4 " INC_PR = "r0" - -PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" - -FILES_${PN}-qmlplugins = " \ - ${OE_QMAKE_PATH_QML}/*/*.so \ - ${OE_QMAKE_PATH_QML}/*/qmldir \ - ${OE_QMAKE_PATH_QML}/*/plugins.qmltypes \ -" - -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/*/.debug \ -" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 2100ee1664..27c27031fb 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -8,17 +8,3 @@ do_configure_append() { # Fix rpaths for QtWebProcess find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${SEPB}/lib||g" } - -PACKAGES += "${PN}-qmlplugins-dbg ${PN}-qmlplugins" - -FILES_${PN}-qmlplugins = " \ - ${OE_QMAKE_PATH_QML}/QtWebKit/libqmlwebkitplugin.so \ - ${OE_QMAKE_PATH_QML}/QtWebKit/qmldir \ - ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so \ - ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/qmldir \ -" - -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/QtWebKit/experimental/.debug \ - ${OE_QMAKE_PATH_QML}/QtWebKit/.debug \ -" diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc index 1824f93d08..8c28b2b416 100644 --- a/recipes-qt/qt5/qtxmlpatterns.inc +++ b/recipes-qt/qt5/qtxmlpatterns.inc @@ -1,4 +1,3 @@ require qt5module.inc INC_PR = "r0" - From 1f8945894659ead24fdccad51c33e63da356fb99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 14:57:21 +0200 Subject: [PATCH 134/347] README: change oe-core URL to github and add -M to send-email Signed-off-by: Martin Jansa --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index c0132b0173..bc72c68f06 100644 --- a/README +++ b/README @@ -1,16 +1,16 @@ This layer depends on: -URI: git://git.openembedded.org/openembedded-core +URI: git://github.com/openembedded/oe-core.git branch: master revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5]' in the subject' -When sending single patches, please use something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-qt5][PATCH' +When sending single patches, please using something like: +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-qt5][PATCH' You are encouraged to fork the mirror on github https://github.com/meta-qt5/meta-qt5/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. Main layer maintainers: - Martin 'JaMa' Jansa Otavio Salvador From 5d2b301bcb1637c60503b89cc8530fdd31892cb4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 10:21:41 +0200 Subject: [PATCH 135/347] qt3d: add .bez and .obj files to PN-qmlplugins Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 92b2628a6c..2ac6e4cdb5 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -7,3 +7,8 @@ LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" INC_PR = "r1" + +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/*/*/*.bez \ + ${OE_QMAKE_PATH_QML}/*/*/*.obj \ +" From 996f91828c5275daa7c0dfa4875214f0f16f84ef Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 20:36:42 +0200 Subject: [PATCH 136/347] qt5: Add recipes for missing versions Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb | 13 +++++++++++++ recipes-qt/qt5/qtgraphicaleffects_git.bb | 15 +-------------- recipes-qt/qt5/qtimageformats_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtimageformats_5.0.2.bb | 7 +++++++ recipes-qt/qt5/qtimageformats_git.bb | 6 ++++++ recipes-qt/qt5/qtmultimedia_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtmultimedia_5.0.2.bb | 13 +++++++++++++ recipes-qt/qt5/qtmultimedia_git.bb | 6 ++++++ recipes-qt/qt5/qtquick1_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtquick1_5.0.2.bb | 7 +++++++ recipes-qt/qt5/qtquick1_git.bb | 15 +-------------- recipes-qt/qt5/qtscript_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtscript_5.0.2.bb | 7 +++++++ recipes-qt/qt5/qtscript_git.bb | 15 +-------------- recipes-qt/qt5/qtsvg_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtsvg_5.0.2.bb | 13 +++++++++++++ recipes-qt/qt5/qtsvg_git.bb | 6 ++++++ recipes-qt/qt5/qtwebkit.inc | 5 +++++ recipes-qt/qt5/qtwebkit_5.0.0.bb | 5 ----- recipes-qt/qt5/qtwebkit_5.0.1.bb | 7 +++++++ recipes-qt/qt5/qtwebkit_5.0.2.bb | 7 +++++++ recipes-qt/qt5/qtwebkit_git.bb | 6 ++++++ recipes-qt/qt5/qtxmlpatterns_5.0.1.bb | 13 +++++++++++++ recipes-qt/qt5/qtxmlpatterns_5.0.2.bb | 17 +++++++++++++++++ recipes-qt/qt5/qtxmlpatterns_git.bb | 15 +-------------- 29 files changed, 218 insertions(+), 64 deletions(-) create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.0.1.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.0.2.bb create mode 100644 recipes-qt/qt5/qtimageformats_git.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.0.1.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.0.2.bb create mode 100644 recipes-qt/qt5/qtmultimedia_git.bb create mode 100644 recipes-qt/qt5/qtquick1_5.0.1.bb create mode 100644 recipes-qt/qt5/qtquick1_5.0.2.bb create mode 100644 recipes-qt/qt5/qtscript_5.0.1.bb create mode 100644 recipes-qt/qt5/qtscript_5.0.2.bb create mode 100644 recipes-qt/qt5/qtsvg_5.0.1.bb create mode 100644 recipes-qt/qt5/qtsvg_5.0.2.bb create mode 100644 recipes-qt/qt5/qtsvg_git.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.0.1.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.0.2.bb create mode 100644 recipes-qt/qt5/qtwebkit_git.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.1.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.2.bb diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e4e18501c8..15e75174ef 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -3,4 +3,4 @@ require qt5-git.inc PR = "${INC_PR}.0" -SRCREV = "3d42f6fed220cd0cd24924eb55db4b2751eed74c" +SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e4e18501c8..15e75174ef 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -3,4 +3,4 @@ require qt5-git.inc PR = "${INC_PR}.0" -SRCREV = "3d42f6fed220cd0cd24924eb55db4b2751eed74c" +SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f7d8dc2706..2f22ee5340 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -3,4 +3,4 @@ require qt5-git.inc PR = "${INC_PR}.0" -SRCREV = "d054755e9e452df05fb590510d25bf4167b97af7" +SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb new file mode 100644 index 0000000000..e6601286bd --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "99b1259b992c31ab4c938a4b69bb8c71" +SRC_URI[sha256sum] = "448c66b45e1744c1470ea839266777c41cc97fa2426b9915b1923c3ef1ae6a82" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb new file mode 100644 index 0000000000..44dedf502b --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.2 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "3d4475a4702f7bbe8064f69e17f1e8dd" +SRC_URI[sha256sum] = "944399c5795b83b8f6b5e4ccec763ce5192f0e99b5e6d256f2b43a3165ee3016" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 783ffa3362..6bcf9d1aea 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,19 +1,6 @@ require ${PN}.inc require qt5-git.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit bd434a6ea358e96c373e3ad65bfb6d939904abf5 -# Author: Timo Jyrinki -# Date: Fri Feb 8 09:09:55 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -# last tag before this SRCREV is 5.0.0 -PV = "5.0.0+git${SRCPV}" - PR = "${INC_PR}.0" -SRCREV = "9fb5dad66555c197ba19da6be80edf67e92888ba" +SRCREV = "bd434a6ea358e96c373e3ad65bfb6d939904abf5" diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb new file mode 100644 index 0000000000..40ae6cbe58 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c3f357657b68d4c4788f8c7f71be519b" +SRC_URI[sha256sum] = "145cc3d46a338ee8f28ddbebc031044db7d7a72e8c269d3daf542fc4b0e20018" diff --git a/recipes-qt/qt5/qtimageformats_5.0.2.bb b/recipes-qt/qt5/qtimageformats_5.0.2.bb new file mode 100644 index 0000000000..b9947ae9aa --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "e397a4237f51cfef7a3b38ad29b831d7" +SRC_URI[sha256sum] = "93bd13a47002f188a8a83a5c742d396a2008a545fc22d58df442c4c070a463b7" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb new file mode 100644 index 0000000000..bdc7979126 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +SRCREV = "f293cc8539da5d4ea915c957abbba473515793ad" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb new file mode 100644 index 0000000000..dee5c9d998 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "aee9c86a7ff64dfc905ccaef33f0a967" +SRC_URI[sha256sum] = "e87fe8fbc1465840458a88de0be10f096374fb7cd0888c703710c0ecc936d414" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.2.bb b/recipes-qt/qt5/qtmultimedia_5.0.2.bb new file mode 100644 index 0000000000..5abefed0db --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.0.2.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.2 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f0902250974440c9c63569112a67440c" +SRC_URI[sha256sum] = "fffc7bd71e6cb2853da3c90d7f9794583e7a83e4eeb6fea039a2efac53688834" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb new file mode 100644 index 0000000000..e284a739c6 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +SRCREV = "07f20b8afe6976d69359c27278cbda2c4d0a47c7" diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb new file mode 100644 index 0000000000..f234bbbbfc --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "27820e2447e4c3b7ea75f5d4a16b9149" +SRC_URI[sha256sum] = "507d02a5ffaa4f045f5b9cc807190d0f9db80c09b12feb4b4aa2fdb62d1bd529" diff --git a/recipes-qt/qt5/qtquick1_5.0.2.bb b/recipes-qt/qt5/qtquick1_5.0.2.bb new file mode 100644 index 0000000000..7b1d775b63 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "22cd03e2e2aadbc5e2ce324a3526fa8b" +SRC_URI[sha256sum] = "2a2235f4f4afd5bf8c6960efafbe89f8c443f174fb22931d48f566660cfcea9a" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 99c0159380..7978abb69f 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,19 +1,6 @@ require ${PN}.inc require qt5-git.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit 22e940b2c97364df12dbdfb51e9fc5a8eaf8d268 -# Author: Timo Jyrinki -# Date: Fri Feb 8 09:12:41 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -# last tag before this SRCREV is 5.0.0 -PV = "5.0.0+git${SRCPV}" - PR = "${INC_PR}.0" -SRCREV = "be48320bb7213edf0fbca481650a0bc6cf203d30" +SRCREV = "31c3dec9fe1341d412830eb1163e252112f9765c" diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb new file mode 100644 index 0000000000..46a7ea9931 --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "349691431c3cc1b03e2571bac7c6c852" +SRC_URI[sha256sum] = "0b5901a78e8bc6853e7d549f2e8109794b2fb03b7ce22963eb3897eb97256f84" diff --git a/recipes-qt/qt5/qtscript_5.0.2.bb b/recipes-qt/qt5/qtscript_5.0.2.bb new file mode 100644 index 0000000000..13563141d8 --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "929db18c2f4f66cb2ba204076f9f0c22" +SRC_URI[sha256sum] = "def1b60e5ff5513cbda27200554fb568ef822e0ee790476facfe3bcf3438598f" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 006dccf885..77f8c8bbd7 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,19 +1,6 @@ require ${PN}.inc require qt5-git.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit 7a09d123cb29129419dea33c4e2ef0217b339a44 -# Author: Timo Jyrinki -# Date: Fri Feb 8 08:54:39 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -# last tag before this SRCREV is 5.0.0 -PV = "5.0.0+git${SRCPV}" - PR = "${INC_PR}.0" -SRCREV = "e27e5bade2407e022f1814eaaf6cea8bb6741465" +SRCREV = "15f8b3a5f8623d5230865e2fd9811c986a91f7e6" diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb new file mode 100644 index 0000000000..0264c7ec85 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "4bb52d0382d2557781c39cc27f380ce7" +SRC_URI[sha256sum] = "bd053b808b64aad8bfbd3f5399444adedaff97aa16f03e54de91bb0873c20fd3" diff --git a/recipes-qt/qt5/qtsvg_5.0.2.bb b/recipes-qt/qt5/qtsvg_5.0.2.bb new file mode 100644 index 0000000000..2622e6740c --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.0.2.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.2 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "a000016afd3672540b2488c2f8e8d8b3" +SRC_URI[sha256sum] = "5983485ade365a9e809d4614cc76fb106c35d5c514e0312a9013bb25227a6521" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb new file mode 100644 index 0000000000..7adc470c70 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +SRCREV = "04959ec43e93877348c41ff1d36916993948e43d" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 27c27031fb..79ea437de6 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -1,5 +1,10 @@ require qt5module.inc +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ + file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" + DEPENDS += "qtdeclarative icu ruby-native sqlite3" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb index 8ec9cee7d8..6fbe9e4ace 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.0.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.0.bb @@ -1,11 +1,6 @@ require ${PN}.inc require qt5-${PV}.inc -LICENSE = "BSD & LGPLv2+" -LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ - file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ - file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" - PR = "${INC_PR}.0" SRC_URI[md5sum] = "11556c74161612fd37ce70277de3baa4" diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb new file mode 100644 index 0000000000..f91b076dee --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.0.1.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "8210ea90902c4ec526e1e5f7e719ad57" +SRC_URI[sha256sum] = "e1f3a5ff14277a57fa4235d1e3d2ec0029fc888e6e4855b7f7874028ad827cfa" diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb new file mode 100644 index 0000000000..f5ffb3a8b8 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.0.2.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "85aad9f287910c21c8464d7d1ea010a9" +SRC_URI[sha256sum] = "6ff4038f8db68be51661d1a6646f510b26f6ebbecbdeefb76cd8361f808768f6" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb new file mode 100644 index 0000000000..cfa3765c97 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-git.inc + +PR = "${INC_PR}.0" + +SRCREV = "a2e31061d4a24fceb4d32f4df301150ee1cc8af1" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb new file mode 100644 index 0000000000..0363dca263 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb @@ -0,0 +1,13 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE files are missing in 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ + file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "de8b08656a0e1496b18a091dfca82e59" +SRC_URI[sha256sum] = "23cc183f96688992fee46537c8f50bbd20b20e4c92d29fff280e61758c97a59a" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb new file mode 100644 index 0000000000..bd92bd7bf0 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb @@ -0,0 +1,17 @@ +require ${PN}.inc +require qt5-${PV}.inc + +# LICENSE.FDL is missing in 5.0.2, added a bit later: +# commit 3bc0756a63d348d3446d9581f45429c417fd9c29 +# Author: Sergio Ahumada +# Date: Thu Apr 18 11:38:32 2013 +0200 +# Add missing LICENSE.FDL file +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "29e6776165e43e9f3a865338121b4e1d" +SRC_URI[sha256sum] = "c05ae43fffc911ffda808deecebddd1b31916714cefc9cfd840689fc52ae20a6" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index b0d69eb96e..f1b608e2f8 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,19 +1,6 @@ require ${PN}.inc require qt5-git.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit c79d19ae9d4feb353236db49381d8c6b9b032a4b -# Author: Timo Jyrinki -# Date: Thu Feb 7 17:59:12 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -# last tag before this SRCREV is 5.0.0 -PV = "5.0.0+git${SRCPV}" - PR = "${INC_PR}.0" -SRCREV = "8a95cb56f5ecadb450de545061e8444e9698d21f" +SRCREV = "3ca482d01c07ee25213533b31a3ad626c224d95e" From 26097532fb11d683eda5bb80b27901d6be429d18 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 10:40:21 +0200 Subject: [PATCH 137/347] qt5-*.inc: let module.inc to define LICENSE * it was working for LIC_FILES_CHKSUM, but not LICENSE * we need to change order of includes, first version.inc then module.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 8 ++++---- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-5.0.0.inc | 8 ++++---- recipes-qt/qt5/qt5-5.0.1.inc | 8 ++++---- recipes-qt/qt5/qt5-5.0.2.inc | 8 ++++---- recipes-qt/qt5/qt5-git.inc | 8 ++++---- recipes-qt/qt5/qtbase-native_5.0.0.bb | 2 +- recipes-qt/qt5/qtbase-native_5.0.1.bb | 2 +- recipes-qt/qt5/qtbase-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_5.0.0.bb | 2 +- recipes-qt/qt5/qtbase_5.0.1.bb | 2 +- recipes-qt/qt5/qtbase_5.0.2.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.0.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.1.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.2.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.0.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.1.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.2.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtjsbackend-native.inc | 6 +++--- recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_5.0.1.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_git.bb | 2 +- recipes-qt/qt5/qtjsbackend.inc | 6 +++--- recipes-qt/qt5/qtjsbackend_5.0.0.bb | 2 +- recipes-qt/qt5/qtjsbackend_5.0.1.bb | 2 +- recipes-qt/qt5/qtjsbackend_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend_git.bb | 2 +- recipes-qt/qt5/qtjsondb_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.0.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.1.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.2.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.0.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.1.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.2.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtscript_5.0.0.bb | 2 +- recipes-qt/qt5/qtscript_5.0.1.bb | 2 +- recipes-qt/qt5/qtscript_5.0.2.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.0.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.1.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.2.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.0.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.1.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.2.bb | 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.0.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.1.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.2.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 65 files changed, 84 insertions(+), 84 deletions(-) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 2ac6e4cdb5..de3548f25c 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -1,10 +1,10 @@ require qt5module.inc LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ - file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ - file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ - file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ + file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ + file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" INC_PR = "r1" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index e33ce9f1e6..e9c89e6623 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc index e155a207ec..85811c0fa7 100644 --- a/recipes-qt/qt5/qt5-5.0.0.inc +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -12,7 +12,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc index e155a207ec..85811c0fa7 100644 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ b/recipes-qt/qt5/qt5-5.0.1.inc @@ -12,7 +12,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index dc7bda1fcb..f99809ec60 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -15,7 +15,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 39e77f0927..9733a48940 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -17,7 +17,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb index 88c5ee1d64..1ee1693e78 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb index f5d961305a..e1c5118b43 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb index ae81135b5f..3df434e337 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 15e75174ef..71177825a7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb index a2a819e742..7f4cf2986c 100644 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb index f822a3e30d..2dce2c1d6a 100644 --- a/recipes-qt/qt5/qtbase_5.0.1.bb +++ b/recipes-qt/qt5/qtbase_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index ae81135b5f..3df434e337 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 15e75174ef..71177825a7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb index 518f70d66a..1e9876a9ba 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb index 1c33ea56a8..df0ab3dea7 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb index 2027336adb..5853c96cc0 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 2f22ee5340..b7f79bf2ae 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb index 7f5d182735..eabe406254 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb index e6601286bd..b42fbb396c 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb index 44dedf502b..99db424f9e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6bcf9d1aea..199214877e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb index 21812a94fe..2072116bf6 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.0.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb index 40ae6cbe58..99227a31cd 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.1.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtimageformats_5.0.2.bb b/recipes-qt/qt5/qtimageformats_5.0.2.bb index b9947ae9aa..1b881650c0 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.2.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bdc7979126..08f9bd3eba 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index cc8ef3f323..57f017dafe 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -1,8 +1,8 @@ # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " DEPENDS = "qtbase-native" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb index 3bcbbef98b..e6c0410625 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb index a215e7abb5..41b9576ef0 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb index c5d5a742f3..9dcbcc0112 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb index daf0cb2752..f825b9935e 100644 --- a/recipes-qt/qt5/qtjsbackend-native_git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 7ead9dde9a..5a4b90279f 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -2,9 +2,9 @@ require qt5module.inc # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " DEPENDS += "qtjsbackend-native" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb index 3bcbbef98b..e6c0410625 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb index a215e7abb5..41b9576ef0 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb index c5d5a742f3..9dcbcc0112 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb index daf0cb2752..f825b9935e 100644 --- a/recipes-qt/qt5/qtjsbackend_git.bb +++ b/recipes-qt/qt5/qtjsbackend_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb index 8e9bebe670..09d97324e7 100644 --- a/recipes-qt/qt5/qtjsondb_git.bb +++ b/recipes-qt/qt5/qtjsondb_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index fb4d3fa654..8596022f16 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # LICENSE files are missing in this old SRCREV, remove when upgraded # commit 54e6103798bb098bc9e83aa77decdad4868cb98e diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb index 2d703c5355..20e12c0124 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.0.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb index dee5c9d998..3b47de084d 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.1.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_5.0.2.bb b/recipes-qt/qt5/qtmultimedia_5.0.2.bb index 5abefed0db..7b97cbd3b6 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.2.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index e284a739c6..207424b9a9 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb index e410022b32..12d4823053 100644 --- a/recipes-qt/qt5/qtquick1_5.0.0.bb +++ b/recipes-qt/qt5/qtquick1_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb index f234bbbbfc..fe762d19ae 100644 --- a/recipes-qt/qt5/qtquick1_5.0.1.bb +++ b/recipes-qt/qt5/qtquick1_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtquick1_5.0.2.bb b/recipes-qt/qt5/qtquick1_5.0.2.bb index 7b1d775b63..c20732e1ab 100644 --- a/recipes-qt/qt5/qtquick1_5.0.2.bb +++ b/recipes-qt/qt5/qtquick1_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 7978abb69f..717a999993 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb index 8328271eef..00b21368aa 100644 --- a/recipes-qt/qt5/qtscript_5.0.0.bb +++ b/recipes-qt/qt5/qtscript_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb index 46a7ea9931..a8a97b8f27 100644 --- a/recipes-qt/qt5/qtscript_5.0.1.bb +++ b/recipes-qt/qt5/qtscript_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtscript_5.0.2.bb b/recipes-qt/qt5/qtscript_5.0.2.bb index 13563141d8..0bac91ada3 100644 --- a/recipes-qt/qt5/qtscript_5.0.2.bb +++ b/recipes-qt/qt5/qtscript_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 77f8c8bbd7..ceccb9712c 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index f7d324fdc1..5561f94394 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # LICENSE files are missing in this old SRCREV, remove when upgraded # commit cf831b83142dee8114df3bc37c29116a66945f5f diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb index 16dd1338bb..f37bd5b2fd 100644 --- a/recipes-qt/qt5/qtsvg_5.0.0.bb +++ b/recipes-qt/qt5/qtsvg_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb index 0264c7ec85..d27fc29a95 100644 --- a/recipes-qt/qt5/qtsvg_5.0.1.bb +++ b/recipes-qt/qt5/qtsvg_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_5.0.2.bb b/recipes-qt/qt5/qtsvg_5.0.2.bb index 2622e6740c..4ce9b81155 100644 --- a/recipes-qt/qt5/qtsvg_5.0.2.bb +++ b/recipes-qt/qt5/qtsvg_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 7adc470c70..735c34467b 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 4b7f6acb83..e5de6d2b5b 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 40e386bc8d..b5119ec025 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb index 6fbe9e4ace..5cb6cde99d 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.0.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb index f91b076dee..7054af9833 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.1.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb index f5ffb3a8b8..4d2f34d957 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.2.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index cfa3765c97..1b0737a700 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb index bdb72f9f2d..59438fde54 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb index 0363dca263..1e8d3c12b7 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb index bd92bd7bf0..a10c83508a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE.FDL is missing in 5.0.2, added a bit later: # commit 3bc0756a63d348d3446d9581f45429c417fd9c29 diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index f1b608e2f8..1277e3465e 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" From d060f11aa5acdba61afa69c935c35334c8fea613 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 20:34:10 +0200 Subject: [PATCH 138/347] qt5-versions: lock more modules Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index c7e4b376d6..63e1abee66 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -8,3 +8,11 @@ PREFERRED_VERSION_qtbase = "${QT5_VERSION}" PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}" PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}" PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}" +PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" +PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}" +PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" +PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" +PREFERRED_VERSION_qtscript = "${QT5_VERSION}" +PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" +PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" +PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" From 956abd44cc676af060f905c9b5c570f65bb983d3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 12:52:17 +0200 Subject: [PATCH 139/347] qtbase-native: Apply 0001-Always-build-uic.patch for all versions * when uic does not exist in QT_EXTERNAL_HOST_BINS it will silently switch to /usr/bin/qt5/uic and build will fail a bit later Signed-off-by: Martin Jansa --- .../qtbase-5.0.2/0001-Always-build-uic.patch | 31 ++++++++++++++ .../qtbase-git/0001-Always-build-uic.patch | 40 +++++++++++++++++++ recipes-qt/qt5/qtbase-native.inc | 4 ++ recipes-qt/qt5/qtbase-native_5.0.0.bb | 2 - recipes-qt/qt5/qtbase-native_5.0.1.bb | 2 - 5 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch create mode 100644 recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch new file mode 100644 index 0000000000..3f2e3fd925 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch @@ -0,0 +1,31 @@ +From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] 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. + +Signed-off-by: Mikko Levonmaa +--- + src/tools/tools.pro | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/tools.pro b/src/tools/tools.pro +index c67d6bf..b6f3b39 100644 +--- a/src/tools/tools.pro ++++ b/src/tools/tools.pro +@@ -1,8 +1,8 @@ + TEMPLATE = subdirs + +-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc ++TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic + contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml +-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic ++ + # Set subdir and respective target name + src_tools_bootstrap.subdir = $$PWD/bootstrap + src_tools_bootstrap.target = sub-tools-bootstrap +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch new file mode 100644 index 0000000000..a0810bcc50 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch @@ -0,0 +1,40 @@ +From ebe1148e38c5deb3c67dc041e68cd1623531d67b Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] 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. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index b4c9602..f30ec1f 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions + src_plugins.depends += src_gui src_platformsupport + !contains(QT_CONFIG, no-widgets) { +- SUBDIRS += src_tools_uic src_widgets ++ SUBDIRS += src_widgets + src_plugins.depends += src_widgets + contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += src_opengl +@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + } + } + } +-SUBDIRS += src_plugins src_tools_qdoc ++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 9f7b0f719d..d5f23b9946 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -9,6 +9,7 @@ inherit native qmake5_base QT_MODULE = "qtbase" +# shared with target qtbase SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ @@ -21,6 +22,9 @@ SRC_URI += " \ file://0012-wayland-scanner-disable-silent-rules.patch \ " +# specific for native version +SRC_URI += "file://0001-Always-build-uic.patch" + SEPB = "${WORKDIR}/build" B = "${SEPB}" diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb index 1ee1693e78..f791b6006f 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.0.bb @@ -3,7 +3,5 @@ require ${PN}.inc PR = "${INC_PR}.0" -SRC_URI += "file://0001-Always-build-uic.patch" - SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb index e1c5118b43..2dce2c1d6a 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb @@ -3,7 +3,5 @@ require ${PN}.inc PR = "${INC_PR}.0" -SRC_URI += "file://0001-Always-build-uic.patch" - SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" From f76e45b5a8c59b1b8e4b806d2a2a09e6baf4d4e2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 13:14:08 +0200 Subject: [PATCH 140/347] qt5: drop EXTRA_ENV * all variables should be now correctly set by qmake * setting PARALLEL_MAKE in MAKEFLAGS can cause PARALLEL_MAKE * PARALLEL_MAKE processes, because first -j is applied on top level directory and then again in each subdir, but it's faster then make -j PARALLEL_MAKE only in top directory * setting QMAKE breaks build in src/tools/bootstrap, because it forces relative path bin/qmake which isn't correct Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 8 +------- recipes-qt/qt5/qt5.inc | 6 ------ recipes-qt/qt5/qtbase-native.inc | 3 --- recipes-qt/qt5/qtbase.inc | 6 ------ 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 97faad9fc2..0ba0d47fd3 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -15,13 +15,7 @@ OE_QMAKE_DEBUG_OUTPUT = "-d" # Paths in .prl files contain SYSROOT value SSTATE_SCAN_FILES += "*.pri *.prl" -EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" - -EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - STRIP="${OE_QMAKE_STRIP}" \ - MAKE="make -e ${PARALLEL_MAKE}"' +EXTRA_OEMAKE += " MAKEFLAGS='${PARALLEL_MAKE}'" export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a748d89682..ee035dc5b2 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -75,12 +75,6 @@ do_configure() { qmake5_base_do_configure } -do_compile() { - unset CFLAGS CXXFLAGS AR - - oe_runmake ${EXTRA_ENV} -} - do_install() { qmake5_base_do_install } diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index d5f23b9946..b3007a50fe 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -28,9 +28,6 @@ SRC_URI += "file://0001-Always-build-uic.patch" SEPB = "${WORKDIR}/build" B = "${SEPB}" -EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' -EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" - QT_CONF_PATH = "${B}/qt.conf" do_generate_qt_config_file() { diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 80ce22f168..281bbaba41 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -41,12 +41,6 @@ Prefix=.. EOF } -EXTRA_ENV = 'QMAKE="bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} -after \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - STRIP="${OE_QMAKE_STRIP}" \ - MAKE="make -e ${PARALLEL_MAKE}"' - # qtbase is exception, we need to use mkspecs from ${S} QMAKE_MKSPEC_PATH = "${B}" From 32165f04d49082773dbf6b78afe5506cba522f76 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 11:01:28 +0200 Subject: [PATCH 141/347] qtbase-native: fix install paths * 5.0.2+git was installing uic in wrong directory STAGING_DIR_NATIVE was there twice, while debuging this I've noticed that headers and docs are installed in this wrong directory also in other versions Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index b3007a50fe..0d76d2f5d2 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -88,5 +88,20 @@ do_configure_prepend() { } do_install() { + # Fix install paths for all + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" + oe_runmake install INSTALL_ROOT=${D} + + if [ -d ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE} ] ; then + echo "Some files are installed in wrong directory ${D}${STAGING_DIR_NATIVE}" + cp -ra ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE}/* ${D}${STAGING_DIR_NATIVE} + rm -rf ${D}${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE} + # remove empty dirs + TMP=`dirname ${D}/${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE}` + while test ${TMP} != ${D}${STAGING_DIR_NATIVE}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done + fi } From ed6e2f317fd0839f51d03aee4120b25a1e1d704c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 15:10:31 +0200 Subject: [PATCH 142/347] qt5: move variables used only in qtbase to qtbase.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 47 +------------------------------------ recipes-qt/qt5/qtbase.inc | 49 +++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index ee035dc5b2..2feeed6214 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -1,4 +1,5 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2013 Martin Jansa inherit qmake5 @@ -6,56 +7,10 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" -DEPENDS += "virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" - require qt5_arch.inc QT_MODULE ?= "${BPN}" -QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" -QT_DISTRO_FLAGS_linuxstdbase = "-sm" - -# Some can be used only for certain QT_MODULEs, so define them here, -# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc -QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" -QT_GLFLAGS ?= "" -QT_XML ?= "-xmlpatterns" -QT_WEBKIT ?= "-webkit" -QT_PHONON ?= "-phonon" -QT_DBUS ?= "-qdbus" -QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" -QT_MODULE_FLAGS ?= "" -QT_NAS ?= "-no-nas-sound" -QT_NIS ?= "-no-nis" -QT_CUPS ?= "-no-cups" -QT_STL ?= "-stl" -QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" -QT_TESTS ?= "-nomake tests" -QT_EXAMPLES ?= "-nomake examples" -QT_DEMOS ?= "-nomake demos" -QT_RELEASE ?= "-release" - -QT_CONFIG_FLAGS += " \ - ${QT_RELEASE} \ - -reduce-relocations \ - -shared \ - -silent \ - -glib \ - -no-pch \ - -no-rpath \ - -pkg-config \ - ${QT_SYSTEM_LIBS} \ - ${QT_NIS} \ - ${QT_CUPS} \ - ${QT_SQL_DRIVER_FLAGS} \ - ${QT_DISTRO_FLAGS} \ - ${QT_MODULE_FLAGS} \ - ${QT_GLFLAGS} \ - ${QT_TESTS} \ - ${QT_EXAMPLES} \ - ${QT_DEMOS} \ -" - SEPB = "${WORKDIR}/build" B = "${SEPB}" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 281bbaba41..2af9179614 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -20,19 +20,60 @@ DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2 XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" # reenable when we switch to "-qt-xcb" and build of # DEPENDS += "${XCB_DEPENDS}" -# QT_MODULE_FLAGS = "-qt-xcb" +# QT_XCB = "-qt-xcb" # src/platformsupport/glxconvenience/ is resolved to be before build of # src/plugins/platforms/xcb/ -QT_MODULE_FLAGS = "-no-xcb" +QT_XCB ?= "-no-xcb" + +QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" +QT_DISTRO_FLAGS_linuxstdbase = "-sm" + +# Some can be used only for certain QT_MODULEs, so define them here, +# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc +QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" +QT_GLFLAGS ?= "" +QT_XML ?= "-xmlpatterns" +QT_WEBKIT ?= "-webkit" +QT_PHONON ?= "-phonon" +QT_DBUS ?= "-qdbus" +QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" +QT_NAS ?= "-no-nas-sound" +QT_NIS ?= "-no-nis" +QT_CUPS ?= "-no-cups" +QT_STL ?= "-stl" +QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" +QT_TESTS ?= "-nomake tests" +QT_EXAMPLES ?= "-nomake examples" +QT_DEMOS ?= "-nomake demos" +QT_RELEASE ?= "-release" + +QT_CONFIG_FLAGS += " \ + ${QT_RELEASE} \ + -reduce-relocations \ + -shared \ + -silent \ + -glib \ + -no-pch \ + -no-rpath \ + -pkg-config \ + ${QT_SYSTEM_LIBS} \ + ${QT_NIS} \ + ${QT_CUPS} \ + ${QT_SQL_DRIVER_FLAGS} \ + ${QT_DISTRO_FLAGS} \ + ${QT_XCB} \ + ${QT_GLFLAGS} \ + ${QT_TESTS} \ + ${QT_EXAMPLES} \ + ${QT_DEMOS} \ +" INC_PR = "r0" # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" -inherit qmake5 - do_generate_qt_config_file_append() { cat >> ${WORKDIR}/qt.conf < Date: Tue, 7 May 2013 15:37:49 +0200 Subject: [PATCH 143/347] qtjsondb, qtwebkit: respect ICU variable --- recipes-qt/qt5/qtjsondb.inc | 2 +- recipes-qt/qt5/qtwebkit.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc index 887b2610bd..0b049dc39a 100644 --- a/recipes-qt/qt5/qtjsondb.inc +++ b/recipes-qt/qt5/qtjsondb.inc @@ -1,6 +1,6 @@ require qt5module.inc -DEPENDS += "qtdeclarative icu" +DEPENDS += "qtdeclarative ${ICU}" LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" # this is for latest SRCREV: diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 79ea437de6..8f6f9a0484 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" -DEPENDS += "qtdeclarative icu ruby-native sqlite3" +DEPENDS += "qtdeclarative ${ICU} ruby-native sqlite3" INC_PR = "r0" From ae45cb478fbfacc7e2e23eb365c1f740ad325335 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 15:30:56 +0200 Subject: [PATCH 144/347] qt5module: drop it and include only qt5.inc * not all modules depend on qtbase, qtbase-native dependency is added by qmake5.bbclass: QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 2 +- recipes-qt/qt5/qt5module.inc | 3 --- recipes-qt/qt5/qtdeclarative.inc | 2 +- recipes-qt/qt5/qtgraphicaleffects.inc | 2 +- recipes-qt/qt5/qtimageformats.inc | 4 +++- recipes-qt/qt5/qtjsbackend.inc | 4 ++-- recipes-qt/qt5/qtjsondb.inc | 2 +- recipes-qt/qt5/qtlocation.inc | 4 ++-- recipes-qt/qt5/qtmultimedia.inc | 2 +- recipes-qt/qt5/qtquick1.inc | 2 +- recipes-qt/qt5/qtscript.inc | 4 +++- recipes-qt/qt5/qtsensors.inc | 4 ++-- recipes-qt/qt5/qtsvg.inc | 4 +++- recipes-qt/qt5/qtsystems.inc | 4 ++-- recipes-qt/qt5/qtwayland.inc | 4 ++-- recipes-qt/qt5/qtwebkit.inc | 2 +- recipes-qt/qt5/qtxmlpatterns.inc | 4 +++- 17 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 recipes-qt/qt5/qt5module.inc diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index de3548f25c..89b378c0ac 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ diff --git a/recipes-qt/qt5/qt5module.inc b/recipes-qt/qt5/qt5module.inc deleted file mode 100644 index bbb05a6557..0000000000 --- a/recipes-qt/qt5/qt5module.inc +++ /dev/null @@ -1,3 +0,0 @@ -require qt5.inc - -DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 8cb21ff13c..495e9a985f 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index a6b0fe9dfe..1845faf16d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc DEPENDS += "qtdeclarative" diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc index 8c28b2b416..26e06d4dd8 100644 --- a/recipes-qt/qt5/qtimageformats.inc +++ b/recipes-qt/qt5/qtimageformats.inc @@ -1,3 +1,5 @@ -require qt5module.inc +require qt5.inc + +DEPENDS += "qtbase" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 5a4b90279f..4479654ed0 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " -DEPENDS += "qtjsbackend-native" +DEPENDS += "qtbase qtjsbackend-native" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc index 0b049dc39a..74009d9fd7 100644 --- a/recipes-qt/qt5/qtjsondb.inc +++ b/recipes-qt/qt5/qtjsondb.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc DEPENDS += "qtdeclarative ${ICU}" diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc index ae9cb0c42c..0bcb3805cb 100644 --- a/recipes-qt/qt5/qtlocation.inc +++ b/recipes-qt/qt5/qtlocation.inc @@ -1,5 +1,5 @@ -require qt5module.inc +require qt5.inc -DEPENDS += "qt3d qtdeclarative" +DEPENDS += "qtbase qt3d qtdeclarative" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index c2003fdd2e..d9fdf793e9 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc DEPENDS += "qtdeclarative gstreamer alsa-lib " diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index 8befa81350..db0bf89417 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc DEPENDS += "qtscript" diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc index 8c28b2b416..26e06d4dd8 100644 --- a/recipes-qt/qt5/qtscript.inc +++ b/recipes-qt/qt5/qtscript.inc @@ -1,3 +1,5 @@ -require qt5module.inc +require qt5.inc + +DEPENDS += "qtbase" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc index a6b0fe9dfe..786f603b14 100644 --- a/recipes-qt/qt5/qtsensors.inc +++ b/recipes-qt/qt5/qtsensors.inc @@ -1,5 +1,5 @@ -require qt5module.inc +require qt5.inc -DEPENDS += "qtdeclarative" +DEPENDS += "qtbase qtdeclarative" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc index 8c28b2b416..26e06d4dd8 100644 --- a/recipes-qt/qt5/qtsvg.inc +++ b/recipes-qt/qt5/qtsvg.inc @@ -1,3 +1,5 @@ -require qt5module.inc +require qt5.inc + +DEPENDS += "qtbase" INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index 2c6d144ba2..af4eb41abf 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc @@ -1,6 +1,6 @@ -require qt5module.inc +require qt5.inc -DEPENDS += "qtdeclarative qtjsondb udev bluez4 gconf" +DEPENDS += "qtbase qtdeclarative qtjsondb udev bluez4 gconf" LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" # LICENSE files are missing in 5.0.0 diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 32fb08e96f..0c76b993ee 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc LICENSE = "BSD & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod # make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't # have libxkbcommon in oe-core). XKB_DEPENDS = "libxkbcommon" -DEPENDS += "qtdeclarative wayland wayland-native ${XKB_DEPENDS}" +DEPENDS += "qtbase qtdeclarative wayland wayland-native ${XKB_DEPENDS}" INC_PR = "r1" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 8f6f9a0484..a07fe7e2c5 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -1,4 +1,4 @@ -require qt5module.inc +require qt5.inc LICENSE = "BSD & LGPLv2+" LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc index 8c28b2b416..26e06d4dd8 100644 --- a/recipes-qt/qt5/qtxmlpatterns.inc +++ b/recipes-qt/qt5/qtxmlpatterns.inc @@ -1,3 +1,5 @@ -require qt5module.inc +require qt5.inc + +DEPENDS += "qtbase" INC_PR = "r0" From ee50b5f78aff0abb60084cba978f3f2f499dbba9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 14:19:19 +0200 Subject: [PATCH 145/347] qt3d: add qtdeclarative dependency Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 89b378c0ac..6034be5d8b 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -1,5 +1,7 @@ require qt5.inc +DEPENDS += "qtdeclarative" + LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ From d24764db1b2c15a19fea9218ceef2c6e782d54ab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 14:20:06 +0200 Subject: [PATCH 146/347] qtquick1: add qtsvg, qtxmlpatterns and qtwebkit dependency Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquick1.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index db0bf89417..d39c0e6312 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc @@ -1,5 +1,6 @@ require qt5.inc -DEPENDS += "qtscript" +DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" +# qttools INC_PR = "r0" From 1e41cca4a602b12ccbfbfc46e318c448088e925b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 14:39:37 +0200 Subject: [PATCH 147/347] qtwebkit: add qtlocation and qtsensors dependency Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index a07fe7e2c5..66f3af4962 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" -DEPENDS += "qtdeclarative ${ICU} ruby-native sqlite3" +DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3" INC_PR = "r0" From 9fc87120092d1a7752f077add412d80e3e3b3503 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 15:56:12 +0200 Subject: [PATCH 148/347] qtlocation: add qtjsondb instead of qtdeclarative dependency Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc index 0bcb3805cb..e24516c4cc 100644 --- a/recipes-qt/qt5/qtlocation.inc +++ b/recipes-qt/qt5/qtlocation.inc @@ -1,5 +1,6 @@ require qt5.inc -DEPENDS += "qtbase qt3d qtdeclarative" +DEPENDS += "qtbase qt3d qtjsondb" +# qtsystems qtmultimedia INC_PR = "r0" From f40204dc97a1b228fa13e7e061b361f5aec7c0b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 May 2013 17:19:07 +0200 Subject: [PATCH 149/347] qmake5_base: disable debug output by default Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 0ba0d47fd3..37b608e234 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -9,8 +9,8 @@ QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++" OE_QMAKE_PLATFORM = "linux-oe-g++" -# Add -d to show debug output from every qmake call, but it prints *a lot* -OE_QMAKE_DEBUG_OUTPUT = "-d" +# Add -d to show debug output from every qmake call, but it prints *a lot*, better to add it only to debugged recipe +OE_QMAKE_DEBUG_OUTPUT ?= "" # Paths in .prl files contain SYSROOT value SSTATE_SCAN_FILES += "*.pri *.prl" From 9773d8eb228275751bb2585d823e8df956356b14 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:09:46 +0200 Subject: [PATCH 150/347] qmake5_base: drop default -e from EXTRA_OEMAKE and add variables we want to override * exports are still needed at least for qtbase configure script (which is using our special eval variant of getQ(X)MakeConf functions but maybe we should move them only to qtbase now Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 37b608e234..dbba0bc932 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -15,7 +15,24 @@ OE_QMAKE_DEBUG_OUTPUT ?= "" # Paths in .prl files contain SYSROOT value SSTATE_SCAN_FILES += "*.pri *.prl" -EXTRA_OEMAKE += " MAKEFLAGS='${PARALLEL_MAKE}'" +# drop default -e and add needed OE_QMAKE vars explicitly +# the problem is that when generated Makefile has: +# CFLAGS = -pipe $(OE_QMAKE_CFLAGS) -O2 -pthread -D_REENTRANT -Wall -W -fPIC $(DEFINES) +# then OE_QMAKE_CFLAGS are exported and used correctly, but then whole CFLAGS is overwritten from env (and -fPIC lost and build fails) +EXTRA_OEMAKE = " \ + MAKEFLAGS='${PARALLEL_MAKE}' \ + OE_QMAKE_COMPILER='${OE_QMAKE_COMPILER}' \ + OE_QMAKE_CC='${OE_QMAKE_CC}' \ + OE_QMAKE_CXX='${OE_QMAKE_CXX}' \ + OE_QMAKE_CFLAGS='${OE_QMAKE_CFLAGS}' \ + OE_QMAKE_CXXFLAGS='${OE_QMAKE_CXXFLAGS}' \ + OE_QMAKE_LINK='${OE_QMAKE_LINK}' \ + OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ + OE_QMAKE_AR='${OE_QMAKE_AR}' \ + OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ + OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ + OE_QMAKE_QT_CONFIG='${OE_QMAKE_QT_CONFIG}' \ +" export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" @@ -33,8 +50,6 @@ export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" -EXTRA_QMAKEVARS_PRE += "OE_QMAKE_WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner" - OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_LIBS = "${libdir}" From 1965248b7ba440e27c5c8e30f35ce8cf4afc7987 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:13:07 +0200 Subject: [PATCH 151/347] qmake5: use QT_CONF_PATH variable in do_generate_qt_config_file Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 2 +- recipes-qt/qt5/qtbase.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index dbba0bc932..34757c5aee 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -74,7 +74,7 @@ OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" STRIP[unexport] = "1" do_generate_qt_config_file() { - cat > ${WORKDIR}/qt.conf < ${QT_CONF_PATH} <> ${WORKDIR}/qt.conf <> ${QT_CONF_PATH} < Date: Wed, 8 May 2013 23:58:07 +0200 Subject: [PATCH 152/347] qtbase: add patch to fix build with LD exported in env Signed-off-by: Martin Jansa --- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 +++++++++++++++++++ ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 +++++++++++++++++++ recipes-qt/qt5/qtbase-native.inc | 1 + recipes-qt/qt5/qtbase.inc | 1 + ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 +++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch create mode 100644 recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch create mode 100644 recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 0000000000..9dce1a0254 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,43 @@ +From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 13/13] 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 + +Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index d4131dc..fcd8ecc 100755 +--- a/configure ++++ b/configure +@@ -740,20 +740,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 0000000000..606b0a6d5c --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,43 @@ +From afb5a8d45bd7c816eed959c08b05bbcd86814503 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 13/13] 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 + +Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index 866e535..620ffd6 100755 +--- a/configure ++++ b/configure +@@ -840,20 +840,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 0d76d2f5d2..6791c7f1ff 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -20,6 +20,7 @@ SRC_URI += " \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ file://0012-wayland-scanner-disable-silent-rules.patch \ + file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ " # specific for native version diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index a89bbc16ef..80199a267e 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -12,6 +12,7 @@ SRC_URI += " \ file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ file://0012-wayland-scanner-disable-silent-rules.patch \ + file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ " DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" diff --git a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 0000000000..d4a11d1e9e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,43 @@ +From ec6de65fc787c8a5e782b48b6794646f274da43a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 13/13] 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 + +Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index feb1435..6d3d1e2 100755 +--- a/configure ++++ b/configure +@@ -740,20 +740,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + From 1c29e5de8d402eb4a9d57c6104a33798f5004f68 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 13:10:39 +0200 Subject: [PATCH 153/347] qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 3 --- recipes-qt/qt5/qtbase-native.inc | 3 --- recipes-qt/qt5/qtbase.inc | 3 --- recipes-qt/qt5/qtjsbackend-native.inc | 3 --- 4 files changed, 12 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 2feeed6214..e752ed6e21 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -18,9 +18,6 @@ do_configure() { set_arch set_endian - # Avoid problems with the linkers, since we want the linker to be g++ - unset LD - # Similar logic is in autotools.bbclass if [ -d ${B} -a "${S}" != "${B}" ] ; then # Existing separate build directory, exists, remove diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 6791c7f1ff..bb4ab98628 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -81,9 +81,6 @@ do_configure_prepend() { rm -rf "${B}/*" fi - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD - (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 80199a267e..64de60bb15 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -94,9 +94,6 @@ do_configure() { set_arch set_endian - # Avoid problems with the linkers, since we want the linker to be g++ - unset LD - # Similar logic is in autotools.bbclass if [ -d ${B} -a "${S}" != "${B}" ] ; then # Existing separate build directory, exists, remove diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 57f017dafe..3db013501e 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -27,9 +27,6 @@ do_configure() { rm -rf "${B}/*" fi - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } From 56d2c7f18d5058a168df01d6a4797514a0f958b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:20:41 +0200 Subject: [PATCH 154/347] qmake5_base: export OE_QMAKE variables only in qtbase recipes Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 15 +++++++------- classes/qmake5_base.bbclass | 34 +++++++++++++++----------------- recipes-qt/qt5/qtbase-native.inc | 11 +++++++++++ recipes-qt/qt5/qtbase.inc | 11 +++++++++++ 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 4140eb5fb0..349928f081 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,10 +6,11 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" -export OE_QMAKE_LIBS_X11SM = "-lSM -lICE" -export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" -export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" +# do we still need to export these? +#OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" +#OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" +#OE_QMAKE_LIBS_QT = "qt" +#OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +#OE_QMAKE_LIBS_X11SM = "-lSM -lICE" +#OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" +#OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 34757c5aee..9aeafd7086 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -31,24 +31,25 @@ EXTRA_OEMAKE = " \ OE_QMAKE_AR='${OE_QMAKE_AR}' \ OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ - OE_QMAKE_QT_CONFIG='${OE_QMAKE_QT_CONFIG}' \ " -export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" -export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" -export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" -export OE_QMAKE_COMPILER = "${CC}" -export OE_QMAKE_CC = "${CC}" -export OE_QMAKE_CFLAGS = "${CFLAGS}" -export OE_QMAKE_CXX = "${CXX}" -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_LINK = "${CXX}" -export OE_QMAKE_LDFLAGS = "${LDFLAGS}" -export OE_QMAKE_AR = "${AR}" -export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" +OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" +OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" +OE_QMAKE_COMPILER = "${CC}" +OE_QMAKE_CC = "${CC}" +OE_QMAKE_CFLAGS = "${CFLAGS}" +OE_QMAKE_CXX = "${CXX}" +OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +OE_QMAKE_LINK = "${CXX}" +OE_QMAKE_LDFLAGS = "${LDFLAGS}" +OE_QMAKE_AR = "${AR}" +OE_QMAKE_STRIP = "echo" +OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +QT_DIR_NAME ?= "qt5" + +# this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${WORKDIR}/qt.conf" -export QT_DIR_NAME ?= "qt5" OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" @@ -70,9 +71,6 @@ OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" -# do not export STRIP to the environment -STRIP[unexport] = "1" - do_generate_qt_config_file() { cat > ${QT_CONF_PATH} < Date: Wed, 8 May 2013 22:40:30 +0200 Subject: [PATCH 155/347] qmake5: Fix cleaning separate build directory and use it by default * "${B}/*" in quotes doesn't match anything, better to remove whole directory (incluing .files) and recreate it * not sure why I've added quotes after testing first version, we don't expect B with spaces.. but I'm a bit scared with rm -rf ${SOME_VAR} after one glibc upgrade cleaned my whole disk and attached NFS array when OLD_LOCALE_PATH wasn't detected correctly... * qmake works well with separate B, use it by default Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 27 +++++++++++++++++++++++++++ recipes-qt/qt5/qt5.inc | 9 --------- recipes-qt/qt5/qtbase-native.inc | 9 --------- recipes-qt/qt5/qtbase.inc | 6 ------ recipes-qt/qt5/qtjsbackend-native.inc | 9 --------- recipes-qt/qt5/qtwebkit.inc | 2 +- 6 files changed, 28 insertions(+), 34 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 9aeafd7086..0bfacec3b0 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -124,6 +124,33 @@ EOF # TargetSpec The location where to install target mkspec # HostSpec The location where to install host mkspec +# qmake works fine with separate B, use it by default +SEPB = "${WORKDIR}/build" +B = "${SEPB}" + +CONFIGURESTAMPFILE = "${WORKDIR}/qmake5_base_configure.sstate" + +qmake5_base_preconfigure() { + if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${S}" != "${B}" ]; then + echo "Previously configured separate build directory detected, cleaning ${B}" + rm -rf ${B} + mkdir ${B} + fi + fi +} + +qmake5_base_postconfigure(){ + if [ -n "${CONFIGURESTAMPFILE}" ]; then + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi +} + +EXTRAQCONFFUNCS ??= "" + +do_configure[prefuncs] += "qmake5_base_preconfigure ${EXTRAQCONFFUNCS}" +do_configure[postfuncs] += "qmake5_base_postconfigure" + addtask generate_qt_config_file after do_patch before do_configure qmake5_base_do_configure () { diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e752ed6e21..b29bc891f1 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -11,19 +11,10 @@ require qt5_arch.inc QT_MODULE ?= "${BPN}" -SEPB = "${WORKDIR}/build" -B = "${SEPB}" - do_configure() { set_arch set_endian - # Similar logic is in autotools.bbclass - if [ -d ${B} -a "${S}" != "${B}" ] ; then - # Existing separate build directory, exists, remove - rm -rf "${B}/*" - fi - qmake5_base_do_configure } diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index cd54990d46..1216695115 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -26,9 +26,6 @@ SRC_URI += " \ # specific for native version SRC_URI += "file://0001-Always-build-uic.patch" -SEPB = "${WORKDIR}/build" -B = "${SEPB}" - QT_CONF_PATH = "${B}/qt.conf" do_generate_qt_config_file() { @@ -86,12 +83,6 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP do_configure_prepend() { - # Similar logic is in autotools.bbclass - if [ -d ${B} -a "${S}" != "${B}" ] ; then - # Existing separate build directory, exists, remove - rm -rf "${B}/*" - fi - (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 9348fc66df..139811f6d3 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -105,12 +105,6 @@ do_configure() { set_arch set_endian - # Similar logic is in autotools.bbclass - if [ -d ${B} -a "${S}" != "${B}" ] ; then - # Existing separate build directory, exists, remove - rm -rf "${B}/*" - fi - # we need symlink in path relative to source, because # EffectivePaths:Prefix is relative to qmake location if [ ! -e ${B}/bin/qmake ]; then diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 3db013501e..2cf113d833 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -17,16 +17,7 @@ SRC_URI += "\ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " -SEPB = "${WORKDIR}/build" -B = "${SEPB}" - do_configure() { - # Similar logic is in autotools.bbclass - if [ -d ${B} -a "${S}" != "${B}" ] ; then - # Existing separate build directory, exists, remove - rm -rf "${B}/*" - fi - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} } diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 66f3af4962..a25820be60 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -11,5 +11,5 @@ INC_PR = "r0" do_configure_append() { # Fix rpaths for QtWebProcess - find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${SEPB}/lib||g" + find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" } From d8314098bf945b4db15302d47eae1d6fc2df882c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:56:59 +0200 Subject: [PATCH 156/347] qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc * we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4 but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to build to install e.g. in /qt5 which for stuff like qterminal or something doesn't sound right (as long as there isn't qterminal4 and qterminal5 recipe) * some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that every application which installs some QML files will install them in location shared by all * add qt5-native.inc which also adds this QT_DIR_NAME and common inherits (later will be used also by qtwayland-native.inc) Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 18 +++++++++--------- recipes-qt/qt5/qt5-native.inc | 12 ++++++++++++ recipes-qt/qt5/qt5.inc | 11 +++++++++++ recipes-qt/qt5/qtbase-native.inc | 4 ++-- recipes-qt/qt5/qtjsbackend-native.inc | 4 ++-- 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 recipes-qt/qt5/qt5-native.inc diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 0bfacec3b0..3703770649 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -52,20 +52,20 @@ QT_DIR_NAME ?= "qt5" export QT_CONF_PATH = "${WORKDIR}/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}/${QT_DIR_NAME}" -OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}" +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_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" -OE_QMAKE_PATH_DOCS = "${datadir}/${QT_DIR_NAME}/doc" -OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" -OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests" +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}/${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc new file mode 100644 index 0000000000..e1a7798777 --- /dev/null +++ b/recipes-qt/qt5/qt5-native.inc @@ -0,0 +1,12 @@ +inherit native qmake5_base + +# we don't want conflicts with qt4 +OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" +OE_QMAKE_PATH_DOCS = "${docdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" +OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b29bc891f1..79a4833c50 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -22,6 +22,17 @@ do_install() { qmake5_base_do_install } +# we don't want conflicts with qt4 +OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" +OE_QMAKE_PATH_DOCS = "${docdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" +OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests" + PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " # extra -dbg packages diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 1216695115..1de1e1da81 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -5,10 +5,10 @@ HOMEPAGE = "http://qt-project.org" INC_PR = "r1" -inherit native qmake5_base - QT_MODULE = "qtbase" +require qt5-native.inc + # shared with target qtbase SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 2cf113d833..4369af0369 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -9,9 +9,9 @@ DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" -INC_PR = "r0" +require qt5-native.inc -inherit native qmake5_base +INC_PR = "r0" SRC_URI += "\ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ From 94b2064593e565ceaefdd7ef32506a99b0e6792b Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Wed, 8 May 2013 19:51:18 +0200 Subject: [PATCH 157/347] qtbase: move virtual/libgl dependency to extra variable * makes it easier to change desktop gl to gles2 in .bbappend * we cannot explicitly disable opengl with -no-opengl, because then it fails to build (probably only when mesa headers are found in sysroot) /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:62:72: error: 'QPlatformOpenGLContext' has not been declared /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp: In constructor 'QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat&, int*, EGLDisplay, EGLenum)': /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:69:70: error: invalid static_cast from type 'int*' to type 'QEGLPlatformContext*' The same with 5.0.2 Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 139811f6d3..3e4715171e 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -15,16 +15,16 @@ SRC_URI += " \ file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ " -DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" +DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h -XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" +# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" # reenable when we switch to "-qt-xcb" and build of -# DEPENDS += "${XCB_DEPENDS}" # QT_XCB = "-qt-xcb" # src/platformsupport/glxconvenience/ is resolved to be before build of # src/plugins/platforms/xcb/ +XCB_DEPENDS ?= "" QT_XCB ?= "-no-xcb" QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" @@ -33,7 +33,13 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm" # Some can be used only for certain QT_MODULEs, so define them here, # but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" -QT_GLFLAGS ?= "" + +# if you want to enable egl/gles2 in your .bbappend, don't forget to add right dependencies, e.g. +# GL_DEPENDS = "virtual/libgles2 virtual/libegl" +# QT_GLFLAGS = "-opengl es2 -eglfs" +GL_DEPENDS ?= "virtual/libgl" +QT_GLFLAGS ?= "-opengl" + QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" QT_PHONON ?= "-phonon" @@ -70,7 +76,7 @@ QT_CONFIG_FLAGS += " \ ${QT_DEMOS} \ " -INC_PR = "r0" +INC_PR = "r1" # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" From 48138bfb2735e0e07065397d3c93516d202c3104 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:11:02 +0200 Subject: [PATCH 158/347] qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 5 ++- ...Allow-to-add-extra-arguments-to-make.patch | 35 +++++++++++++++++++ ...Allow-to-add-extra-arguments-to-make.patch | 35 +++++++++++++++++++ recipes-qt/qt5/qtbase-native.inc | 1 + recipes-qt/qt5/qtbase.inc | 1 + ...Allow-to-add-extra-arguments-to-make.patch | 35 +++++++++++++++++++ 6 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch create mode 100644 recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch create mode 100644 recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3703770649..d81d283c26 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -172,8 +172,11 @@ qmake5_base_do_configure () { bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'" fi + # for config.tests to read this + export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" + CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" - $CMD || die "Error calling $CMD" + ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" } qmake5_base_do_install() { diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 0000000000..e432b979a5 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,35 @@ +From 68c459603bcf545637e852e08613c6fca4da9ef9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 14/14] 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 Maakefiles to build the application + +Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index 39144e7..1864ba8 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # 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) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 0000000000..7d4b32bffe --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,35 @@ +From c57cec0fdcbc89671ef297c68554e27fbe99c09d Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 14/14] 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 Maakefiles to build the application + +Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index b4569df..50ca562 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # 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) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 1de1e1da81..876982278c 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -21,6 +21,7 @@ SRC_URI += " \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ file://0012-wayland-scanner-disable-silent-rules.patch \ file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " # specific for native version diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 3e4715171e..9624f1defa 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -13,6 +13,7 @@ SRC_URI += " \ file://0011-qt_module-Fix-paths-in-.prl-files.patch \ file://0012-wayland-scanner-disable-silent-rules.patch \ file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}" diff --git a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 0000000000..79d314c565 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,35 @@ +From 01653e270c4a9169a32c0002a87a6644727d0b11 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 14/14] 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 Maakefiles to build the application + +Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index 39144e7..1864ba8 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # 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) +-- +1.8.2.1 + From 34a4b6bc246e8c6ce4e39a12ea7bde3e1a76d1d6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 19:14:15 +0200 Subject: [PATCH 159/347] qtbase: drop setting arch and endian * endian option was removed from configure * arch/host-arch option is now deprecated and configure shows warning when it's used * both are now autodetected Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 5 ----- recipes-qt/qt5/qt5_arch.inc | 19 ------------------- recipes-qt/qt5/qtbase.inc | 3 --- 3 files changed, 27 deletions(-) delete mode 100644 recipes-qt/qt5/qt5_arch.inc diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 79a4833c50..0bf8e6383d 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -7,14 +7,9 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" -require qt5_arch.inc - QT_MODULE ?= "${BPN}" do_configure() { - set_arch - set_endian - qmake5_base_do_configure } diff --git a/recipes-qt/qt5/qt5_arch.inc b/recipes-qt/qt5/qt5_arch.inc deleted file mode 100644 index 25fbf90450..0000000000 --- a/recipes-qt/qt5/qt5_arch.inc +++ /dev/null @@ -1,19 +0,0 @@ -inherit siteinfo - -set_arch() { - case ${TARGET_ARCH} in - arm*) QT_ARCH=arm ;; - i*86*) QT_ARCH=i386 ;; - mips*) QT_ARCH=mips ;; - powerpc*) QT_ARCH=powerpc ;; - x86_64*) QT_ARCH=x86_64 ;; - esac -} - -set_endian() { - if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then - QT_ENDIAN="-little-endian" - elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then - QT_ENDIAN="-big-endian" - fi -} diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 9624f1defa..21a527330c 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -109,9 +109,6 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP do_configure() { - set_arch - set_endian - # we need symlink in path relative to source, because # EffectivePaths:Prefix is relative to qmake location if [ ! -e ${B}/bin/qmake ]; then From 727b27e9368a4c079353d68741e6636a56305db7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 19:16:32 +0200 Subject: [PATCH 160/347] qmake5: move default do_configure and do_install to qmake5.bbclass * it's useful for many recipes outside qt5 and easy to overwrite when needed --- classes/qmake5.bbclass | 8 ++++++++ recipes-qt/qt5/qt5.inc | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 349928f081..a49a7895f3 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -14,3 +14,11 @@ DEPENDS_prepend = "${QT5TOOLSDEPENDS}" #OE_QMAKE_LIBS_X11SM = "-lSM -lICE" #OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" #OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" + +do_configure() { + qmake5_base_do_configure +} + +do_install() { + qmake5_base_do_install +} diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 0bf8e6383d..a8929886d2 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -9,14 +9,6 @@ ICU_powerpc = "pango" QT_MODULE ?= "${BPN}" -do_configure() { - qmake5_base_do_configure -} - -do_install() { - qmake5_base_do_install -} - # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" From 4c197c6223a1c878dfa8c0277a91021c68091a93 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 21:17:01 +0200 Subject: [PATCH 161/347] qmake5_base: Define OE_QMAKE_PATH_QT_* variables * and move it to separate .bbclass which is easier to replace in distro layer when you don't care about conflicts with qt4 Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 20 +----------------- classes/qmake5_paths.bbclass | 38 +++++++++++++++++++++++++++++++++++ recipes-qt/qt5/qt5-native.inc | 18 ++++++++--------- recipes-qt/qt5/qt5.inc | 18 ++++++++--------- 4 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 classes/qmake5_paths.bbclass diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d81d283c26..8ff9565abe 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -51,25 +51,7 @@ QT_DIR_NAME ?= "qt5" # this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${WORKDIR}/qt.conf" -OE_QMAKE_PATH_PREFIX = "${prefix}" -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_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}/${QT_DIR_NAME}" -OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" -OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" +inherit qmake5_paths do_generate_qt_config_file() { cat > ${QT_CONF_PATH} < Date: Fri, 10 May 2013 12:59:47 +0200 Subject: [PATCH 162/347] README: add meta-ruby dependency needed for qtwebkit --- README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README b/README index bc72c68f06..e86ba0a2b9 100644 --- a/README +++ b/README @@ -4,6 +4,11 @@ URI: git://github.com/openembedded/oe-core.git branch: master revision: HEAD +URI: git://github.com/openembedded/meta-oe.git +layers: meta-ruby +branch: master +revision: HEAD + Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5]' in the subject' When sending single patches, please using something like: From 26d8de54047979dee8289c077467ee8b4f4934af Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 May 2013 14:41:57 +0200 Subject: [PATCH 163/347] Add COPYING.MIT to be clear about license of this layer Signed-off-by: Martin Jansa --- COPYING.MIT | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 COPYING.MIT diff --git a/COPYING.MIT b/COPYING.MIT new file mode 100644 index 0000000000..fb950dc69f --- /dev/null +++ b/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 81b7031859176f24c028c7234d795812bd1a3c95 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 May 2013 21:44:31 +0200 Subject: [PATCH 164/347] qtbase: fix qlibrayinfo patch * returning QSettings even without existing qtconfig was causing, e.g. QLibraryInfo::location(QLibraryInfo::PluginsPath) returning "`pwd`/plugins" instead of correct "/usr/lib/qt5/plugins" Signed-off-by: Martin Jansa --- ...ow-to-set-qt.conf-from-the-outside-u.patch | 21 ++++++------------- ...ow-to-set-qt.conf-from-the-outside-u.patch | 21 ++++++------------- ...ow-to-set-qt.conf-from-the-outside-u.patch | 21 ++++++------------- 3 files changed, 18 insertions(+), 45 deletions(-) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 1834beea10..be7813ae60 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 41257668e0cb03056d79b2917d54a6e01bf2ed36 Mon Sep 17 00:00:00 2001 +From 5ba803e0ad0883ff6abc0e1efa1bf3ac3765348d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/14] 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 @@ -10,13 +10,14 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending +Change-Id: Ice5b16b3e3f6ba2c6cff7bd055d074628ab3aed0 Signed-off-by: Martin Jansa --- - src/corelib/global/qlibraryinfo.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + 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 5fb9640..acd11f5 100644 +index 5fb9640..6b40731 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -31,16 +32,6 @@ index 5fb9640..acd11f5 100644 #ifdef QT_BOOTSTRAPPED if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - #endif - if (QFile::exists(qtconfig)) -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); - return new QSettings(qtconfig, QSettings::IniFormat); -+ printf("qt.conf wasn't found!!\n"); - return 0; //no luck - } - -- 1.8.2.1 diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index f14475978f..dfb6ae9371 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From a256652b730e88566eb04dd7cdc39d5a1281c7fe Mon Sep 17 00:00:00 2001 +From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/14] 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 @@ -10,13 +10,14 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending +Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc Signed-off-by: Martin Jansa --- - src/corelib/global/qlibraryinfo.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + 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 5fb9640..acd11f5 100644 +index 5fb9640..6b40731 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -31,16 +32,6 @@ index 5fb9640..acd11f5 100644 #ifdef QT_BOOTSTRAPPED if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - #endif - if (QFile::exists(qtconfig)) -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); - return new QSettings(qtconfig, QSettings::IniFormat); -+ printf("qt.conf wasn't found!!\n"); - return 0; //no luck - } - -- 1.8.2.1 diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index fc71a65325..883b8096b4 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 29812cee9589dedd10a94b66ed5279549ed62f36 Mon Sep 17 00:00:00 2001 +From 7d3de13a6d7a3142da0a5c6ebd815d343a356a23 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/14] 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 @@ -10,13 +10,14 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending +Change-Id: I9247949c20a39eac8e815c175510ea3fb5bf9d33 Signed-off-by: Martin Jansa --- - src/corelib/global/qlibraryinfo.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + 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 a8dc086..c16dfcb 100644 +index a8dc086..8138fff 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -31,16 +32,6 @@ index a8dc086..c16dfcb 100644 #ifdef QT_BOOTSTRAPPED if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - #endif - if (QFile::exists(qtconfig)) -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); - return new QSettings(qtconfig, QSettings::IniFormat); -+ printf("qt.conf wasn't found!!\n"); - return 0; //no luck - } - -- 1.8.2.1 From 35ccafd9c533c423aa7985ec2ce7f0512283c154 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 May 2013 22:16:06 +0200 Subject: [PATCH 165/347] qtbase: refresh patches, drop 2 unused * drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa --- .../0001-Add-linux-oe-g-platform.patch | 3 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 5 ++- .../0003-Add-external-hostbindir-option.patch | 12 ++++--- ...ions-temporary-remove-isEmpty-check.patch} | 8 +++-- ...e-is-already-built-in-qtbase-native.patch} | 4 +-- ...ing-a-separate-qmake-for-the-target.patch} | 4 +-- ...ix-default-LIBDIRS-and-INCDIRS-with.patch} | 7 ++-- ...qt_module-Fix-pkgconfig-replacement.patch} | 7 ++-- ...9-qt_module-Fix-paths-in-.prl-files.patch} | 7 ++-- ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 34 ------------------- ...ayland-scanner-disable-silent-rules.patch} | 7 ++-- ...xport-SYSTEM_VARIABLES-to-.qmake.va.patch} | 9 ++--- ...llow-to-add-extra-arguments-to-make.patch} | 12 ++++--- .../0001-Add-linux-oe-g-platform.patch | 3 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 5 ++- .../0003-Add-external-hostbindir-option.patch | 12 ++++--- ...ions-temporary-remove-isEmpty-check.patch} | 8 +++-- ...e-is-already-built-in-qtbase-native.patch} | 4 +-- ...ing-a-separate-qmake-for-the-target.patch} | 4 +-- ...ix-default-LIBDIRS-and-INCDIRS-with.patch} | 6 ++-- ...qt_module-Fix-pkgconfig-replacement.patch} | 7 ++-- ...9-qt_module-Fix-paths-in-.prl-files.patch} | 7 ++-- ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 33 ------------------ ...ayland-scanner-disable-silent-rules.patch} | 7 ++-- ...xport-SYSTEM_VARIABLES-to-.qmake.va.patch} | 9 ++--- ...llow-to-add-extra-arguments-to-make.patch} | 12 ++++--- recipes-qt/qt5/qtbase-native.inc | 20 ++++++----- recipes-qt/qt5/qtbase.inc | 19 +++++------ .../qtbase/0001-Add-linux-oe-g-platform.patch | 3 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 5 ++- .../0003-Add-external-hostbindir-option.patch | 12 ++++--- ...ions-temporary-remove-isEmpty-check.patch} | 8 +++-- ...e-is-already-built-in-qtbase-native.patch} | 4 +-- ...ing-a-separate-qmake-for-the-target.patch} | 4 +-- ...ix-default-LIBDIRS-and-INCDIRS-with.patch} | 6 ++-- ...qt_module-Fix-pkgconfig-replacement.patch} | 7 ++-- ...9-qt_module-Fix-paths-in-.prl-files.patch} | 7 ++-- ...ename-QT_INSTALL_CONFIGURATION-to-QT.patch | 33 ------------------ ...ayland-scanner-disable-silent-rules.patch} | 7 ++-- ...xport-SYSTEM_VARIABLES-to-.qmake.va.patch} | 9 ++--- ...llow-to-add-extra-arguments-to-make.patch} | 12 ++++--- 41 files changed, 162 insertions(+), 230 deletions(-) rename recipes-qt/qt5/qtbase-5.0.2/{0006-qt_functions-temporary-remove-isEmpty-check.patch => 0004-qt_functions-temporary-remove-isEmpty-check.patch} (86%) rename recipes-qt/qt5/qtbase-5.0.2/{0004-qmake-is-already-built-in-qtbase-native.patch => 0005-qmake-is-already-built-in-qtbase-native.patch} (84%) rename recipes-qt/qt5/{qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch => qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch} (84%) rename recipes-qt/qt5/qtbase-5.0.2/{0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch => 0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch} (87%) rename recipes-qt/qt5/qtbase-5.0.2/{0009-qt_module-Fix-pkgconfig-replacement.patch => 0008-qt_module-Fix-pkgconfig-replacement.patch} (93%) rename recipes-qt/qt5/qtbase-5.0.2/{0011-qt_module-Fix-paths-in-.prl-files.patch => 0009-qt_module-Fix-paths-in-.prl-files.patch} (93%) delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch rename recipes-qt/qt5/qtbase-5.0.2/{0012-wayland-scanner-disable-silent-rules.patch => 0010-wayland-scanner-disable-silent-rules.patch} (92%) rename recipes-qt/qt5/{qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch => qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch} (83%) rename recipes-qt/qt5/{qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch => qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch} (80%) rename recipes-qt/qt5/qtbase-git/{0006-qt_functions-temporary-remove-isEmpty-check.patch => 0004-qt_functions-temporary-remove-isEmpty-check.patch} (87%) rename recipes-qt/qt5/qtbase-git/{0004-qmake-is-already-built-in-qtbase-native.patch => 0005-qmake-is-already-built-in-qtbase-native.patch} (84%) rename recipes-qt/qt5/{qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch => qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch} (84%) rename recipes-qt/qt5/qtbase-git/{0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch => 0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch} (87%) rename recipes-qt/qt5/qtbase-git/{0009-qt_module-Fix-pkgconfig-replacement.patch => 0008-qt_module-Fix-pkgconfig-replacement.patch} (93%) rename recipes-qt/qt5/qtbase-git/{0011-qt_module-Fix-paths-in-.prl-files.patch => 0009-qt_module-Fix-paths-in-.prl-files.patch} (93%) delete mode 100644 recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch rename recipes-qt/qt5/qtbase-git/{0012-wayland-scanner-disable-silent-rules.patch => 0010-wayland-scanner-disable-silent-rules.patch} (96%) rename recipes-qt/qt5/qtbase-git/{0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch => 0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch} (83%) rename recipes-qt/qt5/qtbase-git/{0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch => 0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch} (80%) rename recipes-qt/qt5/qtbase/{0006-qt_functions-temporary-remove-isEmpty-check.patch => 0004-qt_functions-temporary-remove-isEmpty-check.patch} (86%) rename recipes-qt/qt5/qtbase/{0004-qmake-is-already-built-in-qtbase-native.patch => 0005-qmake-is-already-built-in-qtbase-native.patch} (85%) rename recipes-qt/qt5/{qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch => qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch} (84%) rename recipes-qt/qt5/qtbase/{0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch => 0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch} (87%) rename recipes-qt/qt5/qtbase/{0009-qt_module-Fix-pkgconfig-replacement.patch => 0008-qt_module-Fix-pkgconfig-replacement.patch} (93%) rename recipes-qt/qt5/qtbase/{0011-qt_module-Fix-paths-in-.prl-files.patch => 0009-qt_module-Fix-paths-in-.prl-files.patch} (93%) delete mode 100644 recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch rename recipes-qt/qt5/qtbase/{0012-wayland-scanner-disable-silent-rules.patch => 0010-wayland-scanner-disable-silent-rules.patch} (92%) rename recipes-qt/qt5/{qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch => qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch} (83%) rename recipes-qt/qt5/{qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch => qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch} (80%) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index 1cd7dd6088..eaa6451564 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 231e94888c257da84bd39b138f5010c255387ae3 Mon Sep 17 00:00:00 2001 +From d64321c240cbb949b9e55e2cd448c78bf9865c56 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 @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: I464fe8f17fa4ed4c80165183daf79b08fc491697 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index be7813ae60..38aeb22137 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 5ba803e0ad0883ff6abc0e1efa1bf3ac3765348d Mon Sep 17 00:00:00 2001 +From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +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 @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: Ice5b16b3e3f6ba2c6cff7bd055d074628ab3aed0 Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index e44d738116..cd63c449fa 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001 +From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] 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 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index acd11f5..bba0861 100644 +index 6b40731..139a60f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index acd11f5..bba0861 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -297,6 +297,7 @@ static const struct { +@@ -295,6 +295,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch similarity index 86% rename from recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch rename to recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch index ff5bc0c184..7941ef97b9 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,9 +1,13 @@ -From 753924949e1d72c63283ecc904e2134fa76888d7 Mon Sep 17 00:00:00 2001 +From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/12] 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]. + +Upstream-Status: Pending Signed-off-by: Martin Jansa --- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch similarity index 84% rename from recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch rename to recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch index 93cd334d97..d2418fc6af 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From 1dd6ee9bb2aafb8d77d9c7e465b9cf6d778bc283 Mon Sep 17 00:00:00 2001 +From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native +Subject: [PATCH 05/12] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch similarity index 84% rename from recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch index af8eb463f0..fe03edcd2c 100644 --- a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001 +From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target +Subject: [PATCH 06/12] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch similarity index 87% rename from recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch rename to recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index c7c418fde8..3cfe8c3b9c 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,10 +1,11 @@ -From c6909ce9ed3e65833ae835d89b346fbb158a1127 Mon Sep 17 00:00:00 2001 +From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT -Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- tools/configure/configureapp.cpp | 4 ++-- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch similarity index 93% rename from recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch rename to recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch index a9f66b7cb7..d7c8d35ab5 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 0bd37923dec93270066fc4362db7e443475a4b06 Mon Sep 17 00:00:00 2001 +From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement cross-compile unfriendly, keeping ${libdir}/${includedir} works better in my case -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 16 ++++++++++++++-- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch similarity index 93% rename from recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch rename to recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch index 1952308477..13112c4463 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 851960243212ffe0ac25d0fea236b7a8bc0e5dc5 Mon Sep 17 00:00:00 2001 +From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files +Subject: [PATCH 09/12] 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 @@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files SSTATE_SCAN_FILES += "*.pri *.prl" to make them relocateble -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index d5a31acfcd..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 10dde2fe0b7d8fe9ca7b4aa21d351b5dc01341c0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I0f3c3b5c0527d22c0171674710cdbb32f10e990f -Signed-off-by: Martin Jansa ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index c1b7a9f..af2eacf 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch similarity index 92% rename from recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch rename to recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch index 1d2d35e590..cac2bfedf1 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch @@ -1,11 +1,12 @@ -From a74a1b5bc86553863b8dcbea7a7fde5642e73115 Mon Sep 17 00:00:00 2001 +From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules +Subject: [PATCH 10/12] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/wayland-scanner.prf | 6 +++--- diff --git a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch similarity index 83% rename from recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch rename to recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index d4a11d1e9e..9436e39833 100644 --- a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,19 +1,20 @@ -From ec6de65fc787c8a5e782b48b6794646f274da43a Mon Sep 17 00:00:00 2001 +From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/12] 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 -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index feb1435..6d3d1e2 100755 +index 546bed2..34074ee 100755 --- a/configure +++ b/configure @@ -740,20 +740,7 @@ fi'` diff --git a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch similarity index 80% rename from recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch rename to recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 79d314c565..fe891df0c0 100644 --- a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,18 +1,20 @@ -From 01653e270c4a9169a32c0002a87a6644727d0b11 Mon Sep 17 00:00:00 2001 +From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/12] 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 Maakefiles to build the application + Makefiles used in configure tests and also Makefiles to build the application -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +Upstream-Status: Pending + +Signed-off-by: Martin Jansa --- mkspecs/features/configure.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..1864ba8 100644 +index 39144e7..de48b07 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -54,12 +54,12 @@ defineTest(qtCompileTest) { diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 1f328977cc..f55d474ad6 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 853b6920e9f10a29c5619b4239e960ad33080e8e Mon Sep 17 00:00:00 2001 +From e45d617fd823f683ed426d09fd8b6edefb9517ab 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 @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index dfb6ae9371..0725347a9d 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001 +From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +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 @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index e1c56ac3a6..2a64291a52 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001 +From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] 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 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index acd11f5..bba0861 100644 +index 6b40731..139a60f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index acd11f5..bba0861 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -297,6 +297,7 @@ static const struct { +@@ -295,6 +295,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch similarity index 87% rename from recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch rename to recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch index a2b1e5e8f7..6e694544b2 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,9 +1,13 @@ -From e356895802c2a1e596882c79161994ebbf361d65 Mon Sep 17 00:00:00 2001 +From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/12] 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]. + +Upstream-Status: Pending Signed-off-by: Martin Jansa --- diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch similarity index 84% rename from recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch rename to recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index 285c8a46be..febefb8adb 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From d0f322cf4ee9ead48997bb3e3a2c137bba91141b Mon Sep 17 00:00:00 2001 +From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native +Subject: [PATCH 05/12] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch similarity index 84% rename from recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch index 3889ab13eb..4d04c7cedf 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From 41ee07272cea21621c26ddeb02a3756e94b29f9a Mon Sep 17 00:00:00 2001 +From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target +Subject: [PATCH 06/12] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch similarity index 87% rename from recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch rename to recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 90d6f75a04..a1129f796a 100644 --- a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,10 +1,10 @@ -From 6c494ea0e73c9ef60f45e7fdc0de40bb51ad5ac6 Mon Sep 17 00:00:00 2001 +From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT -Change-Id: I464c25888ab8b99ced6bd669b5c6448d491725a8 +Upstream-Status: Pending --- tools/configure/configureapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch similarity index 93% rename from recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch rename to recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 67769b3357..1b3c185f9b 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 72f1087fef0e506b9ab015498f5c7a4b3161c6f3 Mon Sep 17 00:00:00 2001 +From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement cross-compile unfriendly, keeping ${libdir}/${includedir} works better in my case -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 16 ++++++++++++++-- diff --git a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch similarity index 93% rename from recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch rename to recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 65fd4f5eef..1d68efc952 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001 +From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files +Subject: [PATCH 09/12] 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 @@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files SSTATE_SCAN_FILES += "*.pri *.prl" to make them relocateble -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- diff --git a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index 4fa772cde2..0000000000 --- a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d816874a95cb85bdf96e06f763e21c098d92b89 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index c1b7a9f..af2eacf 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch similarity index 96% rename from recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch rename to recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch index ca55e62539..cac9bef4c9 100644 --- a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch @@ -1,11 +1,12 @@ -From db28b82f5a0deb14f57dcfe5c2743ec6b844b9aa Mon Sep 17 00:00:00 2001 +From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules +Subject: [PATCH 10/12] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/wayland-scanner.prf | 14 +++++++------- diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch similarity index 83% rename from recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch rename to recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 606b0a6d5c..fda649819d 100644 --- a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,19 +1,20 @@ -From afb5a8d45bd7c816eed959c08b05bbcd86814503 Mon Sep 17 00:00:00 2001 +From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/12] 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 -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index 866e535..620ffd6 100755 +index dbf99a9..9ca23a4 100755 --- a/configure +++ b/configure @@ -840,20 +840,7 @@ fi'` diff --git a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch similarity index 80% rename from recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch rename to recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 7d4b32bffe..7bcfd7f718 100644 --- a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,18 +1,20 @@ -From c57cec0fdcbc89671ef297c68554e27fbe99c09d Mon Sep 17 00:00:00 2001 +From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/12] 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 Maakefiles to build the application + Makefiles used in configure tests and also Makefiles to build the application -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +Upstream-Status: Pending + +Signed-off-by: Martin Jansa --- mkspecs/features/configure.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index b4569df..50ca562 100644 +index b4569df..d189e50 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -57,12 +57,12 @@ defineTest(qtCompileTest) { diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 876982278c..c7428587ef 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -9,19 +9,21 @@ QT_MODULE = "qtbase" require qt5-native.inc -# shared with target qtbase +# shared with target qtbase, all except +# 0005-qmake-is-already-built-in-qtbase-native.patch +# 0006-Allow-building-a-separate-qmake-for-the-target.patch + 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://0006-qt_functions-temporary-remove-isEmpty-check.patch \ - file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0009-qt_module-Fix-pkgconfig-replacement.patch \ - file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ - file://0011-qt_module-Fix-paths-in-.prl-files.patch \ - file://0012-wayland-scanner-disable-silent-rules.patch \ - file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0010-wayland-scanner-disable-silent-rules.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " # specific for native version diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 21a527330c..5d4334ac60 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -4,16 +4,15 @@ 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-qmake-is-already-built-in-qtbase-native.patch \ - file://0005-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ - file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0009-qt_module-Fix-pkgconfig-replacement.patch \ - file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ - file://0011-qt_module-Fix-paths-in-.prl-files.patch \ - file://0012-wayland-scanner-disable-silent-rules.patch \ - file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0005-qmake-is-already-built-in-qtbase-native.patch \ + file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0010-wayland-scanner-disable-silent-rules.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 5907490ccf..f4645f69b2 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 Mon Sep 17 00:00:00 2001 +From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 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 @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 883b8096b4..fc8a481e63 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 7d3de13a6d7a3142da0a5c6ebd815d343a356a23 Mon Sep 17 00:00:00 2001 +From a836731e94223d49ef05fdabe7905dd1b25c647c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +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 @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: I9247949c20a39eac8e815c175510ea3fb5bf9d33 Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 14d5d52ff8..8c100bc598 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001 +From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] 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 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index e66d9fb..a6ae763 100644 #mkspecs diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c16dfcb..56a269f 100644 +index 8138fff..301643f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index c16dfcb..56a269f 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -293,6 +293,7 @@ static const struct { +@@ -291,6 +291,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch similarity index 86% rename from recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch rename to recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch index ed238bcc8d..d39130c10d 100644 --- a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,9 +1,13 @@ -From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001 +From ff72f8350e8b2ded813163150a7d1874061ed589 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/12] 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]. + +Upstream-Status: Pending Signed-off-by: Martin Jansa --- diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch similarity index 85% rename from recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch rename to recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch index f934cf1d62..319aae6f79 100644 --- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 +From 240fb45541c06103e8a930beeb5ee59a15b529bf Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native +Subject: [PATCH 05/12] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch similarity index 84% rename from recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch index b239fd5bdb..c639c17239 100644 --- a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From a6a15ff0150ca685909782f0ca861fa4336f33b3 Mon Sep 17 00:00:00 2001 +From 892351a55c3f6a033a1823e104315cb0f03b454d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target +Subject: [PATCH 06/12] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch similarity index 87% rename from recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch rename to recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 3229e14ba1..c40c66b1b2 100644 --- a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,10 +1,10 @@ -From 4ba11842fa29ba28a05b3e8e511432fe360b4957 Mon Sep 17 00:00:00 2001 +From 9928daa856cd7433618df38b263e029fb9948679 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT -Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 +Upstream-Status: Pending --- tools/configure/configureapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch similarity index 93% rename from recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch rename to recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch index 0574ca89ff..8d40e4f2fb 100644 --- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001 +From 063936d0daabacad8c9b8e68adf9423d54846290 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement cross-compile unfriendly, keeping ${libdir}/${includedir} works better in my case -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 16 ++++++++++++++-- diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch similarity index 93% rename from recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch rename to recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch index 6eab1cb595..dde3b95b11 100644 --- a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 1809b8b32d3b8a689eb5d40f096b3541345ff219 Mon Sep 17 00:00:00 2001 +From 1a0133993cc7924208dd4a0d818599accbcf999e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files +Subject: [PATCH 09/12] 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 @@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files SSTATE_SCAN_FILES += "*.pri *.prl" to make them relocateble -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- diff --git a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index 7594058f5b..0000000000 --- a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5b01ec1b8da7fc949efea262647a9d6010c670f4 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index dca0c58..8ebba3b 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch similarity index 92% rename from recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch rename to recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch index 9431e79ea4..ff8aaa1d16 100644 --- a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch @@ -1,11 +1,12 @@ -From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001 +From 668c20fe721aba2057c8e929e5029c423a687360 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules +Subject: [PATCH 10/12] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- mkspecs/features/wayland-scanner.prf | 6 +++--- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch similarity index 83% rename from recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch rename to recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 9dce1a0254..d14021240d 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,19 +1,20 @@ -From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001 +From 62c2c404238e007021a80fcf62b51173be23a67e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/12] 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 -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index d4131dc..fcd8ecc 100755 +index 8710c28..8b97cc2 100755 --- a/configure +++ b/configure @@ -740,20 +740,7 @@ fi'` diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch similarity index 80% rename from recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch rename to recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index e432b979a5..5d7cbc3438 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,18 +1,20 @@ -From 68c459603bcf545637e852e08613c6fca4da9ef9 Mon Sep 17 00:00:00 2001 +From b0a008c649f76e0353f49f9c953e9d8141e5927a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/12] 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 Maakefiles to build the application + Makefiles used in configure tests and also Makefiles to build the application -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 +Upstream-Status: Pending + +Signed-off-by: Martin Jansa --- mkspecs/features/configure.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..1864ba8 100644 +index 39144e7..de48b07 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -54,12 +54,12 @@ defineTest(qtCompileTest) { From 14f6ec2ca227c474a9045b68bcf6a6dd78b8cd57 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 24 May 2013 19:50:00 +0200 Subject: [PATCH 166/347] qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG * full path is part of sstate checksum with immediate expansion Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5d4334ac60..cabe0b783b 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -93,7 +93,7 @@ EOF QMAKE_MKSPEC_PATH = "${B}" # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location -OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}" +OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" OE_QMAKE_QMAKE = "bin/qmake" # qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell From a991d0c2ac2d45c8a7540bba4941045abdd0e18d Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Fri, 24 May 2013 18:49:39 -0600 Subject: [PATCH 167/347] Allow to control (disable) widgets build --- recipes-qt/qt5/qtbase.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index cabe0b783b..b0f0447013 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -40,6 +40,7 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p GL_DEPENDS ?= "virtual/libgl" QT_GLFLAGS ?= "-opengl" +QT_WIDGETS ?= "-widgets" QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" QT_PHONON ?= "-phonon" @@ -64,6 +65,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ + ${QT_WIDGETS} \ ${QT_SYSTEM_LIBS} \ ${QT_NIS} \ ${QT_CUPS} \ From 34bed723f37fdbb938f31dd25391e2a495ad6d5d Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:46 +0000 Subject: [PATCH 168/347] qt: package examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index d3708444d6..87bf5e8f18 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -20,7 +20,7 @@ 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}" -PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " # extra -dbg packages FILES_${PN}-qmlplugins-dbg = " \ @@ -98,3 +98,30 @@ FILES_${PN}-dbg += " \ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " +FILES_${PN}-examples = " \ + ${OE_QMAKE_PATH_EXAMPLES}/*/* \ +" +FILES_${PN}-examples-dev = " \ + ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \ +" +FILES_${PN}-examples-dbg = " \ + ${OE_QMAKE_PATH_EXAMPLES}/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \ +" +FILES_${PN}-examples-staticdev = " \ + ${OE_QMAKE_PATH_EXAMPLES}/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ +" From c4fe1b8f553ebf7e8081cbfa34c970c903284708 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:47 +0000 Subject: [PATCH 169/347] qtjsbackend: fix hardfloat detection in v8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 1 + .../0001-Fix-hardfloat-detection.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 4479654ed0..a0dc632401 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -13,4 +13,5 @@ INC_PR = "r0" SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ + file://0001-Fix-hardfloat-detection.patch \ " diff --git a/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch b/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch new file mode 100644 index 0000000000..3d86fbf1b2 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch @@ -0,0 +1,33 @@ +From 05a87fccb76447ce3cb4b926128af929f26469bb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Wed, 22 May 2013 18:50:01 +0200 +Subject: [PATCH] Fix hardfloat detection + +based on the same patch for nodejs which says : + +gcc has a builtin define to denote hard abi when in use, e.g. when +using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore +we should check that to determine which calling convention is in use +and not __VFP_FP__ which merely indicates presence of VFP unit + +The fix has been provided by Khem Raj +--- + src/3rdparty/v8/src/platform-linux.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc +index f6db423..8ae2249 100644 +--- a/src/3rdparty/v8/src/platform-linux.cc ++++ b/src/3rdparty/v8/src/platform-linux.cc +@@ -167,7 +167,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { + // calling this will return 1.0 and otherwise 0.0. + static void ArmUsingHardFloatHelper() { + asm("mov r0, #0":::"r0"); +-#if defined(__VFP_FP__) && !defined(__SOFTFP__) ++#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) + // Load 0x3ff00000 into r1 using instructions available in both ARM + // and Thumb mode. + asm("mov r1, #3":::"r1"); +-- +1.7.10.4 + From 7698fc1494a1bdf04cee20f7206bf2879a718646 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:48 +0000 Subject: [PATCH 170/347] qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit else qml application segfault. Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_5.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb index 2dce2c1d6a..dfcb742f22 100644 --- a/recipes-qt/qt5/qtbase_5.0.1.bb +++ b/recipes-qt/qt5/qtbase_5.0.1.bb @@ -3,5 +3,7 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0004-Disable-mkv8snapshot.patch" + SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" From 440e7829dccd48ef249a7314ebee00d4e3a584c5 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:49 +0000 Subject: [PATCH 171/347] qtbase: remove non existing parts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit make/nomake demos doesn't exist in qt5. Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 1 - recipes-qt/qt5/qtbase.inc | 2 -- 2 files changed, 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index c7428587ef..b50d4469f6 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -69,7 +69,6 @@ EXTRA_OECONF = " \ -silent \ -nomake examples \ -nomake tests \ - -nomake demos \ -no-rpath \ -platform linux-oe-g++ \ " diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b0f0447013..739a9361ac 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -53,7 +53,6 @@ QT_STL ?= "-stl" QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" QT_TESTS ?= "-nomake tests" QT_EXAMPLES ?= "-nomake examples" -QT_DEMOS ?= "-nomake demos" QT_RELEASE ?= "-release" QT_CONFIG_FLAGS += " \ @@ -75,7 +74,6 @@ QT_CONFIG_FLAGS += " \ ${QT_GLFLAGS} \ ${QT_TESTS} \ ${QT_EXAMPLES} \ - ${QT_DEMOS} \ " INC_PR = "r1" From 712d678c3accc499af0f1fc4d0d55359787b6009 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:50 +0000 Subject: [PATCH 172/347] qtbase-5.0.2: fix v8 and allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fix v8 segfault (at least on armv7) - examples are only provided as sources but in our case, binaries are more interesting for user to test the features on the target. Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../0001-qtbase-allow-build-of-examples.patch | 49 +++++++++++++++++++ recipes-qt/qt5/qtbase_5.0.2.bb | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch new file mode 100644 index 0000000000..17b951a394 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch @@ -0,0 +1,49 @@ +From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sat, 25 May 2013 17:34:32 +0200 +Subject: [PATCH] qtbase: allow build of examples +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this revert the following commit : + +commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 +Author: Oswald Buddenhagen +Date: Fri Dec 21 19:36:12 2012 +0100 + + do not actually build examples in production builds + + -developer-build enables an actual build of examples, based on the + assumption that developers want to test it (it can be still disabled + with -nomake examples). regular users otoh want only the examples + sources installed. + + Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 + Reviewed-by: Joerg Bornemann + +Signed-off-by: Eric Bénard +--- + mkspecs/features/qt_example_installs.prf | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 479a16a..ca1b0c7 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) + allfiles -= doc + !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") + } +- +- # Do not actually build the examples in production builds with -prefix +- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { +- TEMPLATE = aux +- CONFIG -= have_target qt staticlib dll +- SOURCES = +- INSTALLS -= target +- } + } +-- +1.8.1.4 + diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 3df434e337..357c06e763 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -3,5 +3,9 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0004-Disable-mkv8snapshot.patch \ + file://0001-qtbase-allow-build-of-examples.patch \ + " + SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" From 7994fc13da2971376621e9d8653f89e1d9323eaa Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:51 +0000 Subject: [PATCH 173/347] qtdeclarative-5.0.2: fix examples compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../0001-qmltestexample-fix-link.patch | 34 +++++++++++++++++++ recipes-qt/qt5/qtdeclarative_5.0.2.bb | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch new file mode 100644 index 0000000000..7ed95e4bcf --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch @@ -0,0 +1,34 @@ +From e22cb54286083886be5081332de2f64ab0b78b4b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sun, 26 May 2013 14:26:19 +0200 +Subject: [PATCH] qmltestexample: fix link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get : +ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found + +Upstream-Status: Inappropriate + +Signed-off-by: Eric Bénard +--- + examples/qmltest/qmltest/qmltest.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5..1b00e6c 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml + # This code exists solely for the purpose of building this example + # inside the examples/ hierarchy. + +-QT += qml qmltest ++QT += qml qmltest quick + + macx: CONFIG -= app_bundle + +-- +1.8.1.4 + diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb index 5853c96cc0..6f6793897a 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -3,5 +3,9 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ +" + SRC_URI[md5sum] = "55ab45a7a17db5b202b225603a35a37c" SRC_URI[sha256sum] = "dcfcc6c0d1913d285dd7b42dd9bc457c304f3e3074a1e0d875fff1e9a8318520" From f52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 27 May 2013 23:43:53 +0000 Subject: [PATCH 174/347] qtbase: add option to enable tslib support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - the tslib support is not enabled by default and configure doesn't have any option to active it, so add the option to the build system, - patch tslib support to get the device from the environment variable (patch taken from https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch - provide variable to enable tslib support in a bbappend (disabled by default) - tested on an i.MX5x target with qt 5.0.2 TODO : test with 5.0, 5.0.1 and _git Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../0001-configure-add-tslib-support.patch | 78 +++++++++++++++++++ ...-device-to-be-read-from-env-variable.patch | 34 ++++++++ recipes-qt/qt5/qtbase.inc | 9 ++- recipes-qt/qt5/qtbase_5.0.2.bb | 2 + 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch new file mode 100644 index 0000000000..3407f60959 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch @@ -0,0 +1,78 @@ +From b4edefdc1fb5ba67b202fad7df5a8def554d16fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Mon, 27 May 2013 18:45:03 +0200 +Subject: [PATCH] configure: add tslib support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Eric Bénard +--- + configure | 24 ++++++++++++++++++++++++ + src/plugins/generic/generic.pro | 4 ++++ + 2 files changed, 28 insertions(+) + +diff --git a/configure b/configure +index 2ea1ea4..727fed9 100755 +--- a/configure ++++ b/configure +@@ -810,6 +810,7 @@ CFG_KMS=auto + CFG_LIBUDEV=auto + CFG_OBSOLETE_WAYLAND=no + CFG_EVDEV=auto ++CFG_TSLIB=auto + CFG_NIS=auto + CFG_CUPS=auto + CFG_ICONV=auto +@@ -1782,6 +1783,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ tslib) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_TSLIB="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + cups) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_CUPS="$VAL" +@@ -4775,6 +4783,22 @@ if [ "$CFG_EVDEV" = "no" ]; then + QMakeVar add DEFINES QT_NO_EVDEV + fi + ++if [ "$CFG_TSLIB" != "no" ]; then ++ if compileTest unix/tslib "tslib"; then ++ CFG_TSLIB=yes ++ QT_CONFIG="$QT_CONFIG tslib" ++ elif [ "$CFG_TSLIB" = "yes" ]; then ++ echo "The tslib functionality test failed!" ++ exit 1 ++ else ++ CFG_TSLIB=no ++ fi ++fi ++if [ "$CFG_TSLIB" = "no" ]; then ++ QMakeVar add DEFINES QT_NO_TSLIB ++fi ++ ++ + # Check we actually have X11 :-) + if compileTest x11/xlib "XLib"; then + QT_CONFIG="$QT_CONFIG xlib" +diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro +index 078db2f..18a8295 100644 +--- a/src/plugins/generic/generic.pro ++++ b/src/plugins/generic/generic.pro +@@ -5,3 +5,7 @@ TEMPLATE = subdirs + contains(QT_CONFIG, evdev) { + SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet + } ++ ++contains(QT_CONFIG, tslib) { ++ SUBDIRS += tslib ++} +-- +1.8.1.4 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch new file mode 100644 index 0000000000..77ddcba3a3 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch @@ -0,0 +1,34 @@ +From cb7d4b978d7b29e3f4ef5dba1ca1319ccd289a0d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Mon, 27 May 2013 18:32:37 +0200 +Subject: [PATCH] enables tslib device to be read from env variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +from : +https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch + +Signed-off-by: Eric Bénard +--- + src/plugins/generic/tslib/qtslib.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp +index 6986fd5..2ed4a69 100644 +--- a/src/plugins/generic/tslib/qtslib.cpp ++++ b/src/plugins/generic/tslib/qtslib.cpp +@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, + qDebug() << "QTsLibMouseHandler" << key << specification; + setObjectName(QLatin1String("TSLib Mouse Handler")); + +- QByteArray device = "/dev/input/event1"; ++ QByteArray device = qgetenv("TSLIB_TSDEVICE"); ++ if(device.isEmpty()) ++ device = "/dev/input/event1"; + if (specification.startsWith("/dev/")) + device = specification.toLocal8Bit(); + +-- +1.8.1.4 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 739a9361ac..f286274ab9 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -15,7 +15,7 @@ SRC_URI += " \ file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " -DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}" +DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" @@ -40,6 +40,12 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p GL_DEPENDS ?= "virtual/libgl" QT_GLFLAGS ?= "-opengl" +# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies +# TSLIB_DEPENDS = "tslib" +# QT_TSLIB = "-tslib" +TSLIB_DEPENDS ?= "" +QT_TSLIB ?= "-no-tslib" + QT_WIDGETS ?= "-widgets" QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" @@ -74,6 +80,7 @@ QT_CONFIG_FLAGS += " \ ${QT_GLFLAGS} \ ${QT_TESTS} \ ${QT_EXAMPLES} \ + ${QT_TSLIB} \ " INC_PR = "r1" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 357c06e763..2cd94dd72b 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -5,6 +5,8 @@ PR = "${INC_PR}.0" SRC_URI += "file://0004-Disable-mkv8snapshot.patch \ file://0001-qtbase-allow-build-of-examples.patch \ + file://0001-enables-tslib-device-to-be-read-from-env-variable.patch \ + file://0001-configure-add-tslib-support.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" From f8b065ea1174dd1fa7d93359f6826bfc9d23174c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 11:48:09 +0200 Subject: [PATCH 175/347] qt5: drop 5.0.0 and 5.0.1 versions * maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 4 +- recipes-qt/qt5/qt5-5.0.0.inc | 18 -- recipes-qt/qt5/qt5-5.0.1.inc | 18 -- recipes-qt/qt5/qt5-5.0.2.inc | 2 - recipes-qt/qt5/qtbase-native_5.0.0.bb | 7 - recipes-qt/qt5/qtbase-native_5.0.1.bb | 7 - .../qtbase/0001-Add-linux-oe-g-platform.patch | 304 ------------------ .../qt5/qtbase/0001-Always-build-uic.patch | 31 -- ...ow-to-set-qt.conf-from-the-outside-u.patch | 36 --- .../0003-Add-external-hostbindir-option.patch | 221 ------------- ...tions-temporary-remove-isEmpty-check.patch | 50 --- ...005-AddSynchoronization-qimagereader.patch | 37 --- ...ke-is-already-built-in-qtbase-native.patch | 30 -- ...ding-a-separate-qmake-for-the-target.patch | 29 -- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 -- ...-qt_module-Fix-pkgconfig-replacement.patch | 68 ---- ...09-qt_module-Fix-paths-in-.prl-files.patch | 62 ---- ...wayland-scanner-disable-silent-rules.patch | 46 --- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 --- ...Allow-to-add-extra-arguments-to-make.patch | 37 --- recipes-qt/qt5/qtbase_5.0.0.bb | 10 - recipes-qt/qt5/qtbase_5.0.1.bb | 9 - ...ug-when-flicking-twice-using-touches.patch | 39 --- recipes-qt/qt5/qtdeclarative_5.0.0.bb | 17 - recipes-qt/qt5/qtdeclarative_5.0.1.bb | 13 - recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb | 14 - recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb | 13 - recipes-qt/qt5/qtimageformats_5.0.0.bb | 13 - recipes-qt/qt5/qtimageformats_5.0.1.bb | 13 - recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 12 - recipes-qt/qt5/qtjsbackend-native_5.0.1.bb | 12 - recipes-qt/qt5/qtjsbackend_5.0.0.bb | 12 - recipes-qt/qt5/qtjsbackend_5.0.1.bb | 12 - recipes-qt/qt5/qtmultimedia_5.0.0.bb | 13 - recipes-qt/qt5/qtmultimedia_5.0.1.bb | 13 - recipes-qt/qt5/qtquick1_5.0.0.bb | 13 - recipes-qt/qt5/qtquick1_5.0.1.bb | 13 - recipes-qt/qt5/qtscript_5.0.0.bb | 13 - recipes-qt/qt5/qtscript_5.0.1.bb | 13 - recipes-qt/qt5/qtsvg_5.0.0.bb | 13 - recipes-qt/qt5/qtsvg_5.0.1.bb | 13 - recipes-qt/qt5/qtwebkit_5.0.0.bb | 8 - recipes-qt/qt5/qtwebkit_5.0.1.bb | 7 - recipes-qt/qt5/qtxmlpatterns_5.0.0.bb | 13 - recipes-qt/qt5/qtxmlpatterns_5.0.1.bb | 13 - 45 files changed, 2 insertions(+), 1412 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-5.0.0.inc delete mode 100644 recipes-qt/qt5/qt5-5.0.1.inc delete mode 100644 recipes-qt/qt5/qtbase-native_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtbase-native_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch delete mode 100644 recipes-qt/qt5/qtbase/0001-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch delete mode 100644 recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch delete mode 100644 recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch delete mode 100644 recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtbase_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch delete mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtimageformats_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtimageformats_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtmultimedia_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtmultimedia_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtquick1_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtquick1_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtscript_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtscript_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtsvg_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtsvg_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtwebkit_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtwebkit_5.0.1.bb delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.1.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 63e1abee66..01a5a25aef 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.0", "5.0.1", "5.0.2", "5.0.2+git%" +# possible values now "5.0.2", "5.0.2+git%" -QT5_VERSION ?= "5.0.1" +QT5_VERSION ?= "5.0.2" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc deleted file mode 100644 index 85811c0fa7..0000000000 --- a/recipes-qt/qt5/qt5-5.0.0.inc +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. - -QT_VERSION ?= "${PV}" - -# it's different for RC versions -QT_VERSION_DIR ?= "${QT_VERSION}" - -SRC_URI += " \ - http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ -" - -S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc deleted file mode 100644 index 85811c0fa7..0000000000 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. - -QT_VERSION ?= "${PV}" - -# it's different for RC versions -QT_VERSION_DIR ?= "${QT_VERSION}" - -SRC_URI += " \ - http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ -" - -S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index f99809ec60..e2a56e5c54 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -6,8 +6,6 @@ QT_VERSION ?= "${PV}" # it's different for RC versions QT_VERSION_DIR ?= "${QT_VERSION}" -DEFAULT_PREFERENCE = "-1" - SRC_URI += " \ http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ " diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb deleted file mode 100644 index f791b6006f..0000000000 --- a/recipes-qt/qt5/qtbase-native_5.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" -SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb deleted file mode 100644 index 2dce2c1d6a..0000000000 --- a/recipes-qt/qt5/qtbase-native_5.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" -SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch deleted file mode 100644 index f4645f69b2..0000000000 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ /dev/null @@ -1,304 +0,0 @@ -From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 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 - -* 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: Pending - -Signed-off-by: Martin Jansa ---- - configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ - mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 187 insertions(+), 7 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 89246c8..0ab8eee 100755 ---- a/configure -+++ b/configure -@@ -216,6 +216,16 @@ getQMakeConf() - getQMakeConf3 "$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 -@@ -224,6 +234,16 @@ getXQMakeConf() - getQMakeConf3 "$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" - for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" -@@ -2623,7 +2655,7 @@ else - CFG_FRAMEWORK=no - fi - --QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` - - TEST_COMPILER=$QMAKE_CONF_COMPILER - if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then -@@ -2632,7 +2664,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 -@@ -3587,6 +3619,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. Please wait..." -@@ -3625,11 +3665,11 @@ 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_CXXFLAGS -- setBootstrapVariable QMAKE_LFLAGS -+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CFLAGS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS -+ setBootstrapEvalVariable QMAKE_LFLAGS - - if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" -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 --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch deleted file mode 100644 index 3f2e3fd925..0000000000 --- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] 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. - -Signed-off-by: Mikko Levonmaa ---- - src/tools/tools.pro | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/tools.pro b/src/tools/tools.pro -index c67d6bf..b6f3b39 100644 ---- a/src/tools/tools.pro -+++ b/src/tools/tools.pro -@@ -1,8 +1,8 @@ - TEMPLATE = subdirs - --TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc -+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic - contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml --!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic -+ - # Set subdir and respective target name - src_tools_bootstrap.subdir = $$PWD/bootstrap - src_tools_bootstrap.target = sub-tools-bootstrap --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index fc8a481e63..0000000000 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a836731e94223d49ef05fdabe7905dd1b25c647c 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: Pending - -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 a8dc086..8138fff 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -138,7 +138,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(); --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch deleted file mode 100644 index 8c100bc598..0000000000 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/12] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 15 ++++++++++++++- - mkspecs/features/qt_functions.prf | 5 ++++- - mkspecs/features/qt_tool.prf | 2 +- - qmake/property.cpp | 1 + - qtbase.pro | 15 +++++++++++---- - src/corelib/global/qlibraryinfo.cpp | 3 ++- - src/corelib/global/qlibraryinfo.h | 1 + - tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 42 insertions(+), 8 deletions(-) - -diff --git a/configure b/configure -index 0ab8eee..50f1ef2 100755 ---- a/configure -+++ b/configure -@@ -928,6 +928,7 @@ CFG_GCC_SYSROOT="yes" - QT_HOST_PREFIX= - QT_HOST_BINS= - QT_HOST_DATA= -+QT_EXTERNAL_HOST_BINS= - - #flags for SQL drivers - QT_CFLAGS_PSQL= -@@ -1026,7 +1027,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style options that pass an argument -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1223,6 +1224,9 @@ while [ "$#" -gt 0 ]; do - hostbindir) - QT_HOST_BINS="$VAL" - ;; -+ external-hostbindir) -+ QT_EXTERNAL_HOST_BINS="$VAL" -+ ;; - pkg-config) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PKGCONFIG="$VAL" -@@ -2921,6 +2925,11 @@ else - QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` - fi - -+# 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 -+ - #------------------------------------------------------------------------------- - # help - interactive parts of the script _after_ this section please - #------------------------------------------------------------------------------- -@@ -3087,6 +3096,9 @@ 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 -@@ -3558,6 +3570,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { - "qt_hpfxpath=$QT_HOST_PREFIX", - "qt_hbinpath=$QT_HOST_BINS", - "qt_hdatpath=$QT_HOST_DATA", -+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", - "qt_targspec=$shortxspec", - "qt_hostspec=$shortspec", - #endif -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 389f241..e249960 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,10 @@ defineTest(qtAddModules) { - defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS/get]/$$2 -+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ $$1 = $$[QT_HOST_BINS/get]/$$2 -+ } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { - exists($$eval($$1).bat) { - $$1 = $$eval($$1).bat -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 16db6c7..5518933 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) { -+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index bbd4734..dca0c58 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -74,6 +74,7 @@ static const struct { - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, - { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, - { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, -+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, - { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, - { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, - }; -diff --git a/qtbase.pro b/qtbase.pro -index e66d9fb..a6ae763 100644 ---- a/qtbase.pro -+++ b/qtbase.pro -@@ -68,17 +68,24 @@ CONFIG -= qt - - #qmake - qmake.path = $$[QT_HOST_BINS] -+qmake.files = $$OUT_PWD/bin/qmake -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 - - #syncqt - syncqt.path = $$[QT_HOST_BINS] - syncqt.files = $$PWD/bin/syncqt --equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt -+} -+equals(QMAKE_HOST.os, Windows) { -+ syncqt.files = $${syncqt.files}.bat -+} - INSTALLS += syncqt - - #mkspecs -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 8138fff..301643f 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() - */ - - static const struct { -- char key[19], value[13]; -+ char key[21], value[13]; - } qtConfEntries[] = { - { "Prefix", "." }, - { "Documentation", "doc" }, // should be ${Data}/doc -@@ -291,6 +291,7 @@ static const struct { - { "HostPrefix", "" }, - { "HostBinaries", "bin" }, - { "HostData", "." }, -+ { "ExternalHostBinaries", "" }, - { "TargetSpec", "" }, - { "HostSpec", "" }, - #endif -diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index a574b4b..1535d20 100644 ---- a/src/corelib/global/qlibraryinfo.h -+++ b/src/corelib/global/qlibraryinfo.h -@@ -85,6 +85,7 @@ public: - HostPrefixPath, - HostBinariesPath, - HostDataPath, -+ ExternalHostBinariesPath, - TargetSpecPath, - HostSpecPath, - LastHostPath = HostSpecPath, -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 126643e..0e01ab5 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -1143,6 +1143,13 @@ void Configure::parseCmdLine() - dictionary[ "QT_HOST_DATA" ] = 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) -@@ -3627,6 +3634,7 @@ void Configure::generateQConfigCpp() - << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl - << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl - << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl -+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl - << " \"qt_targspec=" << targSpec << "\"," << endl - << " \"qt_hostspec=" << hostSpec << "\"," << endl - << "#endif" << endl --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index d39130c10d..0000000000 --- a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ff72f8350e8b2ded813163150a7d1874061ed589 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/12] 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]. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index e249960..105ba4c 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS/get]/$$2 - } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 5518933..b0e4f28 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch b/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch deleted file mode 100644 index a16731a9f2..0000000000 --- a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit e28c03cb829c229209090d7939a9aba1af1fdea9 -Author: aavit -Date: Tue Feb 19 18:11:16 2013 +0100 - - Fix reentrancy problem in image reading - - There were race conditions when accessing the plugin factory and - the image reader plugins from different threads; ref QTBUG-29281. - Added a mutex lock to avoid. - - Change-Id: Ic1a3b6cbaf5603f1bcf7025b58247a9a3f6d08a9 - Reviewed-by: Samuel Rødal - -Upstream-Status: Backport (from 5.1.0) - -diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp -index 5eaf7bb..6847786 100644 ---- a/src/gui/image/qimagereader.cpp -+++ b/src/gui/image/qimagereader.cpp -@@ -133,6 +133,7 @@ - // factory loader - #include - #include -+#include - - // image handlers - #include -@@ -232,6 +233,9 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, - QByteArray suffix; - - #ifndef QT_NO_IMAGEFORMATPLUGIN -+ static QMutex mutex; -+ QMutexLocker locker(&mutex); -+ - typedef QMultiMap PluginKeyMap; - - // check if we have plugins that support the image format diff --git a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index 319aae6f79..0000000000 --- a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 240fb45541c06103e8a930beeb5ee59a15b529bf Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/12] 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 50f1ef2..8710c28 100755 ---- a/configure -+++ b/configure -@@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - mkdir -p "$outpath/qmake" || exit --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index c639c17239..0000000000 --- a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 892351a55c3f6a033a1823e104315cb0f03b454d Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/12] 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-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index c40c66b1b2..0000000000 --- a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9928daa856cd7433618df38b263e029fb9948679 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending ---- - 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 0e01ab5..6bb7986 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - if (!dictionary["XQMAKESPEC"].isEmpty() && !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; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index 8d40e4f2fb..0000000000 --- a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 063936d0daabacad8c9b8e68adf9423d54846290 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement - -* 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 50e9469..9532377 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -191,18 +191,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$[QT_INSTALL_PREFIX/get] -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - } - - unix { - CONFIG += create_libtool explicitlib - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace - } - - unix|win32-g++* { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index dde3b95b11..0000000000 --- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1a0133993cc7924208dd4a0d818599accbcf999e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/12] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 9532377..73053f7 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -195,17 +195,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - } --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index ff8aaa1d16..0000000000 --- a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 668c20fe721aba2057c8e929e5029c423a687360 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/12] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 90e1e0f..0750849 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index d14021240d..0000000000 --- a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 62c2c404238e007021a80fcf62b51173be23a67e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/12] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index 8710c28..8b97cc2 100755 ---- a/configure -+++ b/configure -@@ -740,20 +740,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 5d7cbc3438..0000000000 --- a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b0a008c649f76e0353f49f9c953e9d8141e5927a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/12] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..de48b07 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # 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) --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb deleted file mode 100644 index 7f4cf2986c..0000000000 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://0004-Disable-mkv8snapshot.patch" -SRC_URI += "file://0005-AddSynchoronization-qimagereader.patch" - -SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" -SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb deleted file mode 100644 index dfcb742f22..0000000000 --- a/recipes-qt/qt5/qtbase_5.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://0004-Disable-mkv8snapshot.patch" - -SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" -SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch b/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch deleted file mode 100644 index 650e603ae2..0000000000 --- a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 27be7a832f017653ffda705407bb7a64246eda1f Mon Sep 17 00:00:00 2001 -From: Daniel d'Andrada -Date: Tue, 18 Dec 2012 10:51:21 -0200 -Subject: [PATCH] Flickable: Fix bug when flicking twice using touches - -When you flick twice in rapid succession, in the same direction, -the expected behavior is for flickable to be moving quite fast in the -direction of the flicks. - -But when you flicked using touch events instead of mouse ones, -the second flick caused Flickable to immediately halt. This change fixes it. - -Upstream-Status: Backport - -Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05 -Reviewed-by: Andras Becsi ---- - src/quick/items/qquickflickable.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp -index 6e5e6b7..88ef20f 100644 ---- a/src/quick/items/qquickflickable.cpp -+++ b/src/quick/items/qquickflickable.cpp -@@ -2038,6 +2038,11 @@ bool QQuickFlickable::sendMouseEvent(QQuickItem *item, QMouseEvent *event) - - QQuickWindow *c = window(); - QQuickItem *grabber = c ? c->mouseGrabberItem() : 0; -+ if (grabber == this && d->stealMouse) { -+ // we are already the grabber and we do want the mouse event to ourselves. -+ return true; -+ } -+ - bool grabberDisabled = grabber && !grabber->isEnabled(); - bool stealThisEvent = d->stealMouse; - if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) { --- -1.7.9.5 - diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb deleted file mode 100644 index 1e9876a9ba..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.1" - -SRC_URI += " \ - file://0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch \ -" - -SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" -SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb deleted file mode 100644 index df0ab3dea7..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78" -SRC_URI[sha256sum] = "fa7c6941626ff4a40419f9be286f478b0461ac57f4a058035b3e1a9043dfee85" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb deleted file mode 100644 index eabe406254..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "1031f8021a2b2e3a2387d94103e8868e" -SRC_URI[sha256sum] = "e9cf71b4da1a1e879845f1fb1a532408ff6a0875e407a65d6bb3ce3dff0fe942" - diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb deleted file mode 100644 index b42fbb396c..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "99b1259b992c31ab4c938a4b69bb8c71" -SRC_URI[sha256sum] = "448c66b45e1744c1470ea839266777c41cc97fa2426b9915b1923c3ef1ae6a82" diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb deleted file mode 100644 index 2072116bf6..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "cf2955d48e5674bfad6def4dd3acacca" -SRC_URI[sha256sum] = "9280f13cdc58b02ab4562538fc381afa36df071564e0404a2ee48ecd0af659c6" diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb deleted file mode 100644 index 99227a31cd..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "c3f357657b68d4c4788f8c7f71be519b" -SRC_URI[sha256sum] = "145cc3d46a338ee8f28ddbebc031044db7d7a72e8c269d3daf542fc4b0e20018" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb deleted file mode 100644 index e6c0410625..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" -SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb deleted file mode 100644 index 41b9576ef0..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" -SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb deleted file mode 100644 index e6c0410625..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" -SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb deleted file mode 100644 index 41b9576ef0..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd" -SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb deleted file mode 100644 index 20e12c0124..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "bc24e00ded809c0c457ff3480c6d4198" -SRC_URI[sha256sum] = "55915e30ba089dd6f9cd5e0dfe93e231c4d741da0f85a2e16d5a47f948424cc4" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb deleted file mode 100644 index 3b47de084d..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "aee9c86a7ff64dfc905ccaef33f0a967" -SRC_URI[sha256sum] = "e87fe8fbc1465840458a88de0be10f096374fb7cd0888c703710c0ecc936d414" diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb deleted file mode 100644 index 12d4823053..0000000000 --- a/recipes-qt/qt5/qtquick1_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "04bc1ae59321676eb0239f8a3f9dcd95" -SRC_URI[sha256sum] = "3d0236546b1d2bdcfb2aa36091fd4cfbfaa64c89c69df9d6e4b7fa38a4c40504" diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb deleted file mode 100644 index fe762d19ae..0000000000 --- a/recipes-qt/qt5/qtquick1_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "27820e2447e4c3b7ea75f5d4a16b9149" -SRC_URI[sha256sum] = "507d02a5ffaa4f045f5b9cc807190d0f9db80c09b12feb4b4aa2fdb62d1bd529" diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb deleted file mode 100644 index 00b21368aa..0000000000 --- a/recipes-qt/qt5/qtscript_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "0759bd132e46fb6d95451764018f3a92" -SRC_URI[sha256sum] = "8722e48c5f1f989ae920288fb4f5176ae5563775442d9f0aec1fc2e79869fb5f" diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb deleted file mode 100644 index a8a97b8f27..0000000000 --- a/recipes-qt/qt5/qtscript_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "349691431c3cc1b03e2571bac7c6c852" -SRC_URI[sha256sum] = "0b5901a78e8bc6853e7d549f2e8109794b2fb03b7ce22963eb3897eb97256f84" diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb deleted file mode 100644 index f37bd5b2fd..0000000000 --- a/recipes-qt/qt5/qtsvg_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "2dbed5aeae30bd492a38ca230e69e038" -SRC_URI[sha256sum] = "be3674b5b058503ba90ae9138fec8de25c2e67a12059e937b3540e50a1ca08cf" diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb deleted file mode 100644 index d27fc29a95..0000000000 --- a/recipes-qt/qt5/qtsvg_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "4bb52d0382d2557781c39cc27f380ce7" -SRC_URI[sha256sum] = "bd053b808b64aad8bfbd3f5399444adedaff97aa16f03e54de91bb0873c20fd3" diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb deleted file mode 100644 index 5cb6cde99d..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "11556c74161612fd37ce70277de3baa4" -SRC_URI[sha256sum] = "45981088d39ec044762861ee67acee8524ca20b13f1543a3045219aa9da21f9f" - diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb deleted file mode 100644 index 7054af9833..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "8210ea90902c4ec526e1e5f7e719ad57" -SRC_URI[sha256sum] = "e1f3a5ff14277a57fa4235d1e3d2ec0029fc888e6e4855b7f7874028ad827cfa" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb deleted file mode 100644 index 59438fde54..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.0 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "5a76672bc411bb9cd1e0158d86706062" -SRC_URI[sha256sum] = "689d7d89fe71b8fba53183825294bc769ffe1a60dae4ccf5fa3ee6fe704b5172" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb deleted file mode 100644 index 1e8d3c12b7..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "de8b08656a0e1496b18a091dfca82e59" -SRC_URI[sha256sum] = "23cc183f96688992fee46537c8f50bbd20b20e4c92d29fff280e61758c97a59a" From 1496c6ba34bf95bce67504c72edace1bc2c0a64e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 12:47:20 +0200 Subject: [PATCH 176/347] qtbase: refresh patches * all patches applied in recipes should be also applied in https://github.com/meta-qt5/qtbase branches to make it easier to upgrade to new version without loosing any patches * apply: 0013-Disable-mkv8snapshot.patch 0014-enables-tslib-device-to-be-read-from-env-variable.patch 0015-qtbase-allow-build-of-examples.patch also for git version, only 0016-configure-add-tslib-support.patch is now 5.0.2 specific (similar patch already applied in stable branch) Signed-off-by: Martin Jansa --- .../0001-Add-linux-oe-g-platform.patch | 2 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 2 +- .../0003-Add-external-hostbindir-option.patch | 2 +- ...tions-temporary-remove-isEmpty-check.patch | 2 +- ...ke-is-already-built-in-qtbase-native.patch | 2 +- ...ding-a-separate-qmake-for-the-target.patch | 2 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 2 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 2 +- ...09-qt_module-Fix-paths-in-.prl-files.patch | 2 +- ...wayland-scanner-disable-silent-rules.patch | 2 +- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 2 +- ...Allow-to-add-extra-arguments-to-make.patch | 2 +- .../0013-Disable-mkv8snapshot.patch} | 16 +++--- ...device-to-be-read-from-env-variable.patch} | 6 +-- ...0015-qtbase-allow-build-of-examples.patch} | 6 +-- ...=> 0016-configure-add-tslib-support.patch} | 14 +++--- .../0001-Add-linux-oe-g-platform.patch | 2 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 2 +- .../0003-Add-external-hostbindir-option.patch | 2 +- ...tions-temporary-remove-isEmpty-check.patch | 2 +- ...ke-is-already-built-in-qtbase-native.patch | 2 +- ...ding-a-separate-qmake-for-the-target.patch | 2 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 2 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 2 +- ...09-qt_module-Fix-paths-in-.prl-files.patch | 2 +- ...wayland-scanner-disable-silent-rules.patch | 2 +- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 2 +- ...Allow-to-add-extra-arguments-to-make.patch | 2 +- .../0013-Disable-mkv8snapshot.patch | 47 ++++++++++++++++++ ...-device-to-be-read-from-env-variable.patch | 35 +++++++++++++ .../0015-qtbase-allow-build-of-examples.patch | 49 +++++++++++++++++++ recipes-qt/qt5/qtbase-native.inc | 3 ++ recipes-qt/qt5/qtbase.inc | 3 ++ recipes-qt/qt5/qtbase_5.0.2.bb | 8 ++- 34 files changed, 185 insertions(+), 50 deletions(-) rename recipes-qt/qt5/{qtbase/0004-Disable-mkv8snapshot.patch => qtbase-5.0.2/0013-Disable-mkv8snapshot.patch} (82%) rename recipes-qt/qt5/qtbase-5.0.2/{0001-enables-tslib-device-to-be-read-from-env-variable.patch => 0014-enables-tslib-device-to-be-read-from-env-variable.patch} (88%) rename recipes-qt/qt5/qtbase-5.0.2/{0001-qtbase-allow-build-of-examples.patch => 0015-qtbase-allow-build-of-examples.patch} (92%) rename recipes-qt/qt5/qtbase-5.0.2/{0001-configure-add-tslib-support.patch => 0016-configure-add-tslib-support.patch} (86%) create mode 100644 recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch create mode 100644 recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch create mode 100644 recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index eaa6451564..1d74b3f644 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From d64321c240cbb949b9e55e2cd448c78bf9865c56 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/16] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 38aeb22137..e741ca1829 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 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/16] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index cd63c449fa..2ade1790d1 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/12] Add -external-hostbindir option +Subject: [PATCH 03/16] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch index 7941ef97b9..572d25cba5 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/16] 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 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch index d2418fc6af..b2121cf001 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/12] qmake is already built in qtbase-native +Subject: [PATCH 05/16] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch index fe03edcd2c..97333149ad 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/12] Allow building a separate qmake for the target +Subject: [PATCH 06/16] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 3cfe8c3b9c..0eb735c8c9 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/16] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch index d7c8d35ab5..dee753bbd3 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/16] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch index 13112c4463..b7f648394a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/12] qt_module: Fix paths in .prl files +Subject: [PATCH 09/16] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch index cac2bfedf1..1e8bfb7e8b 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/12] wayland-scanner: disable silent rules +Subject: [PATCH 10/16] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 9436e39833..1cb7e007e0 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/16] 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 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index fe891df0c0..3346566c6a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/16] 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 diff --git a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch similarity index 82% rename from recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch rename to recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch index ae48373282..decdc50186 100644 --- a/recipes-qt/qt5/qtbase/0004-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ -From 2719aaabbf29a0f28638e5d67f4d68d548b593a7 Mon Sep 17 00:00:00 2001 +From 78b716520396b5317a8b91dbca183483bea8b1d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH] Disable mkv8snapshot +Subject: [PATCH 13/16] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -25,15 +25,15 @@ Program received signal SIGILL, Illegal instruction. Signed-off-by: Mikko Levonmaa --- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 89246c8..b7d1cb5 100755 +index 34074ee..ac09bbf 100755 --- a/configure +++ b/configure -@@ -779,7 +779,7 @@ CFG_BUILD_PARTS="" - CFG_NOBUILD_PARTS="" +@@ -799,7 +799,7 @@ CFG_NOBUILD_PARTS="" + CFG_SKIP_MODULES="" CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto -CFG_V8SNAPSHOT=auto @@ -42,5 +42,5 @@ index 89246c8..b7d1cb5 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.7.4.1 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch similarity index 88% rename from recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch rename to recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch index 77ddcba3a3..306e13793a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ -From cb7d4b978d7b29e3f4ef5dba1ca1319ccd289a0d Mon Sep 17 00:00:00 2001 +From f8336efd143109c3478e5548360248f99b645548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH] enables tslib device to be read from env variable +Subject: [PATCH 14/16] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -30,5 +30,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.1.4 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch similarity index 92% rename from recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch rename to recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch index 17b951a394..15e96bd3eb 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ -From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001 +From a21c676a69388cd8cdf0bb28184de2bee58def0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH] qtbase: allow build of examples +Subject: [PATCH 15/16] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -45,5 +45,5 @@ index 479a16a..ca1b0c7 100644 - } } -- -1.8.1.4 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch similarity index 86% rename from recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch rename to recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch index 3407f60959..f69b9adfab 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-configure-add-tslib-support.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch @@ -1,7 +1,7 @@ -From b4edefdc1fb5ba67b202fad7df5a8def554d16fd Mon Sep 17 00:00:00 2001 +From 3038a3c7678867f8a7a30de7973d0eca8c0d737f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:45:03 +0200 -Subject: [PATCH] configure: add tslib support +Subject: [PATCH 16/16] configure: add tslib support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Signed-off-by: Eric Bénard 2 files changed, 28 insertions(+) diff --git a/configure b/configure -index 2ea1ea4..727fed9 100755 +index ac09bbf..f1252a0 100755 --- a/configure +++ b/configure -@@ -810,6 +810,7 @@ CFG_KMS=auto +@@ -829,6 +829,7 @@ CFG_KMS=auto CFG_LIBUDEV=auto CFG_OBSOLETE_WAYLAND=no CFG_EVDEV=auto @@ -24,7 +24,7 @@ index 2ea1ea4..727fed9 100755 CFG_NIS=auto CFG_CUPS=auto CFG_ICONV=auto -@@ -1782,6 +1783,13 @@ while [ "$#" -gt 0 ]; do +@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -38,7 +38,7 @@ index 2ea1ea4..727fed9 100755 cups) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_CUPS="$VAL" -@@ -4775,6 +4783,22 @@ if [ "$CFG_EVDEV" = "no" ]; then +@@ -4815,6 +4823,22 @@ if [ "$CFG_EVDEV" = "no" ]; then QMakeVar add DEFINES QT_NO_EVDEV fi @@ -74,5 +74,5 @@ index 078db2f..18a8295 100644 + SUBDIRS += tslib +} -- -1.8.1.4 +1.8.2.1 diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index f55d474ad6..942cc9cb4e 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From e45d617fd823f683ed426d09fd8b6edefb9517ab 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/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0725347a9d..e1087f2a12 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ From 4da4d9606efc8d3109296906e5b13814499ae698 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/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 2a64291a52..0b98683e63 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/12] Add -external-hostbindir option +Subject: [PATCH 03/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch index 6e694544b2..77b1c41fb4 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/15] 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 - diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index febefb8adb..d95e0b4538 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/12] qmake is already built in qtbase-native +Subject: [PATCH 05/15] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch index 4d04c7cedf..a8778469d2 100644 --- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/12] Allow building a separate qmake for the target +Subject: [PATCH 06/15] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index a1129f796a..f873aae976 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 1b3c185f9b..4d15ee06f8 100644 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 1d68efc952..8a3ef3c136 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/12] qt_module: Fix paths in .prl files +Subject: [PATCH 09/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch index cac9bef4c9..5b14c81813 100644 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/12] wayland-scanner: disable silent rules +Subject: [PATCH 10/15] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index fda649819d..2c2360e654 100644 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 7bcfd7f718..e6602b435b 100644 --- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/15] 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 diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch new file mode 100644 index 0000000000..cd0c059689 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch @@ -0,0 +1,47 @@ +From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 8 Jan 2013 15:58:29 -0800 +Subject: [PATCH 13/15] Disable mkv8snapshot + +It seems to generate code that throws SIGILL, so disabling it + +Program received signal SIGILL, Illegal instruction. +0x26312c60 in ?? () +(gdb) bt + function=..., receiver=..., argc=1978934572, args=0x7efff254, + has_pending_exception=0x7efff277, qml=...) + at ../3rdparty/v8/src/execution.cc:125 + argc=1, argv=0x7efff254, pending_exception=0x7efff277, + convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 + receiver=, argc=, argv=, + pending_exception=0x7efff277, convert_receiver=false) + at ../3rdparty/v8/src/execution.cc:161 + data=, exc=0x7efff277) + at ../3rdparty/v8/src/execution.cc:734 + at ../3rdparty/v8/src/api.cc:4742 + at qml/v8/qv8contextwrapper.cpp:155 + ownership=) at qml/v8/qv8engine.cpp:155 + parent=) at qml/v8/qjsengine.cpp:192 + +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 9ca23a4..96965b6 100755 +--- a/configure ++++ b/configure +@@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS="" + CFG_SKIP_MODULES="" + CFG_RELEASE_QMAKE=no + CFG_AUDIO_BACKEND=auto +-CFG_V8SNAPSHOT=auto ++CFG_V8SNAPSHOT=no + CFG_QML_DEBUG=yes + CFG_JAVASCRIPTCORE_JIT=auto + CFG_PKGCONFIG=auto +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch new file mode 100644 index 0000000000..e55ac7a37e --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -0,0 +1,35 @@ +From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Mon, 27 May 2013 18:32:37 +0200 +Subject: [PATCH 14/15] enables tslib device to be read from env variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +from : +https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch + +Signed-off-by: Eric Bénard +Signed-off-by: Martin Jansa +--- + src/plugins/generic/tslib/qtslib.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp +index 6986fd5..2ed4a69 100644 +--- a/src/plugins/generic/tslib/qtslib.cpp ++++ b/src/plugins/generic/tslib/qtslib.cpp +@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, + qDebug() << "QTsLibMouseHandler" << key << specification; + setObjectName(QLatin1String("TSLib Mouse Handler")); + +- QByteArray device = "/dev/input/event1"; ++ QByteArray device = qgetenv("TSLIB_TSDEVICE"); ++ if(device.isEmpty()) ++ device = "/dev/input/event1"; + if (specification.startsWith("/dev/")) + device = specification.toLocal8Bit(); + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch new file mode 100644 index 0000000000..45a49a6240 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch @@ -0,0 +1,49 @@ +From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sat, 25 May 2013 17:34:32 +0200 +Subject: [PATCH 15/15] qtbase: allow build of examples +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this revert the following commit : + +commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 +Author: Oswald Buddenhagen +Date: Fri Dec 21 19:36:12 2012 +0100 + + do not actually build examples in production builds + + -developer-build enables an actual build of examples, based on the + assumption that developers want to test it (it can be still disabled + with -nomake examples). regular users otoh want only the examples + sources installed. + + Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 + Reviewed-by: Joerg Bornemann + +Signed-off-by: Eric Bénard +--- + mkspecs/features/qt_example_installs.prf | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 479a16a..ca1b0c7 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) + allfiles -= doc + !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") + } +- +- # Do not actually build the examples in production builds with -prefix +- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { +- TEMPLATE = aux +- CONFIG -= have_target qt staticlib dll +- SOURCES = +- INSTALLS -= target +- } + } +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index b50d4469f6..70a3072482 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -24,6 +24,9 @@ SRC_URI += " \ file://0010-wayland-scanner-disable-silent-rules.patch \ file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0013-Disable-mkv8snapshot.patch \ + file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ + file://0015-qtbase-allow-build-of-examples.patch \ " # specific for native version diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f286274ab9..0df3b2a689 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -13,6 +13,9 @@ SRC_URI += " \ file://0010-wayland-scanner-disable-silent-rules.patch \ file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0013-Disable-mkv8snapshot.patch \ + file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ + file://0015-qtbase-allow-build-of-examples.patch \ " DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 2cd94dd72b..c93c012750 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -3,11 +3,9 @@ require ${PN}.inc PR = "${INC_PR}.0" -SRC_URI += "file://0004-Disable-mkv8snapshot.patch \ - file://0001-qtbase-allow-build-of-examples.patch \ - file://0001-enables-tslib-device-to-be-read-from-env-variable.patch \ - file://0001-configure-add-tslib-support.patch \ - " +SRC_URI += " \ + file://0016-configure-add-tslib-support.patch \ +" SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" From 34bf6934ea3a51e6ed9cd71616501c9d1f5e52ee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 11:56:34 +0200 Subject: [PATCH 177/347] qt3d, qtjsondb, qtlocation, qtsensors, qtsystems: bump SRCREV to latest * WARN: because these modules weren't released yet, we need to make sure to use SRCREV compatible with selected PV for other modules, old revisions were compatible with 5.0.[01], I need to test these new SRCREVs to test git versions * tested with 5.0.2 and 5.0.2+git% Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 10 ++++++---- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtjsondb_git.bb | 6 ++++-- recipes-qt/qt5/qtlocation_git.bb | 12 +----------- recipes-qt/qt5/qtsensors_git.bb | 12 +----------- recipes-qt/qt5/qtsystems_git.bb | 8 +++++--- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 6034be5d8b..5ed2232e38 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -2,11 +2,13 @@ require qt5.inc DEPENDS += "qtdeclarative" -LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ - file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ +LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL | GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ - file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ +" INC_PR = "r1" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index e9c89e6623..87d009e7fb 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -8,4 +8,4 @@ PR = "${INC_PR}.0" QT_MODULE_BRANCH = "master" -SRCREV = "d723769d90331f4cde8dcb5aa3973e5c6bad8753" +SRCREV = "0158ce783a61bac3e4f4ff619b0601daf9174ce6" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb index 09d97324e7..b9bb3e74e1 100644 --- a/recipes-qt/qt5/qtjsondb_git.bb +++ b/recipes-qt/qt5/qtjsondb_git.bb @@ -1,9 +1,11 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - # qtjsondb wasn't released yet, last tag before this SRCREV isn't even 5.0.0-beta1, but lets use it for now PV = "4.999+5.0.0-beta1+git${SRCPV}" +PR = "${INC_PR}.0" + +QT_MODULE_BRANCH = "master" + SRCREV = "c7c1e61bb5beddc3f4502548fd9ee498f1534e67" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8596022f16..c79604118e 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,16 +1,6 @@ require qt5-git.inc require ${PN}.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit 54e6103798bb098bc9e83aa77decdad4868cb98e -# Author: Timo Jyrinki -# Date: Mon Feb 11 08:19:48 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - # qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" @@ -18,4 +8,4 @@ PR = "${INC_PR}.0" QT_MODULE_BRANCH = "master" -SRCREV = "ac83b242c26d5b8750b6bf0f9ed0bac0e4569b6c" +SRCREV = "f28408346243cf090326f4738fd838219c21e00f" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 5561f94394..7d3e766365 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,19 +1,9 @@ require qt5-git.inc require ${PN}.inc -# LICENSE files are missing in this old SRCREV, remove when upgraded -# commit cf831b83142dee8114df3bc37c29116a66945f5f -# Author: Timo Jyrinki -# Date: Mon Feb 11 08:56:35 2013 +0200 -# Subject: Add license files mandated by (L)GPL. -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - # qtsensors wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" PR = "${INC_PR}.0" -SRCREV = "6323be3e2fc1b69145f37cda1d0214ec5fa3cb44" +SRCREV = "a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index e5de6d2b5b..d73a9996dc 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,9 +1,11 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" -SRCREV = "2dbaae64ccd0fa3646d68d77cbc9baac7d3bde2e" +PR = "${INC_PR}.0" + +QT_MODULE_BRANCH = "master" + +SRCREV = "701442ad6358b9f27978aafae82074124468f88c" From 4a82435fff932711146b5c36342556fb8af7003c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 13:02:25 +0200 Subject: [PATCH 178/347] qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch Signed-off-by: Martin Jansa --- ...b-to-be-specified-at-configure-time.patch} | 28 ++++++++----------- recipes-qt/qt5/qtbase_5.0.2.bb | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) rename recipes-qt/qt5/qtbase-5.0.2/{0016-configure-add-tslib-support.patch => 0016-Allow-tslib-to-be-specified-at-configure-time.patch} (70%) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch similarity index 70% rename from recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch rename to recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch index f69b9adfab..387961b416 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0016-configure-add-tslib-support.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch @@ -1,26 +1,24 @@ -From 3038a3c7678867f8a7a30de7973d0eca8c0d737f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:45:03 +0200 -Subject: [PATCH 16/16] configure: add tslib support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001 +From: Michael Brasser +Date: Tue, 26 Mar 2013 09:22:51 -0500 +Subject: [PATCH 16/16] Allow tslib to be specified at configure time. -Signed-off-by: Eric Bénard +Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e +Reviewed-by: Oswald Buddenhagen --- - configure | 24 ++++++++++++++++++++++++ + configure | 20 ++++++++++++++++++++ src/plugins/generic/generic.pro | 4 ++++ - 2 files changed, 28 insertions(+) + 2 files changed, 24 insertions(+) diff --git a/configure b/configure -index ac09bbf..f1252a0 100755 +index ac09bbf..188e941 100755 --- a/configure +++ b/configure @@ -829,6 +829,7 @@ CFG_KMS=auto CFG_LIBUDEV=auto CFG_OBSOLETE_WAYLAND=no CFG_EVDEV=auto -+CFG_TSLIB=auto ++CFG_TSLIB=no CFG_NIS=auto CFG_CUPS=auto CFG_ICONV=auto @@ -38,7 +36,7 @@ index ac09bbf..f1252a0 100755 cups) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_CUPS="$VAL" -@@ -4815,6 +4823,22 @@ if [ "$CFG_EVDEV" = "no" ]; then +@@ -4815,6 +4823,18 @@ if [ "$CFG_EVDEV" = "no" ]; then QMakeVar add DEFINES QT_NO_EVDEV fi @@ -53,10 +51,6 @@ index ac09bbf..f1252a0 100755 + CFG_TSLIB=no + fi +fi -+if [ "$CFG_TSLIB" = "no" ]; then -+ QMakeVar add DEFINES QT_NO_TSLIB -+fi -+ + # Check we actually have X11 :-) if compileTest x11/xlib "XLib"; then diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index c93c012750..89cfb7251a 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -4,7 +4,7 @@ require ${PN}.inc PR = "${INC_PR}.0" SRC_URI += " \ - file://0016-configure-add-tslib-support.patch \ + file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" From 1fdab229df6000eb52ac721a3ff4cdd218a0c308 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Tue, 28 May 2013 13:03:54 +0000 Subject: [PATCH 179/347] qtbase: install and split package fonts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fonts were not installed (at least in qt 5.0.2) so install them manually. - split the font package in smaller package as done in qt4 to save space on the target. - use OE_QMAKE_PATH_LIBS which corresponds with: mkspecs/features/qpa/genericunixfontdatabase.prf: fonts.path = $$[QT_INSTALL_LIBS]/fonts Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 0df3b2a689..2a5e3bc356 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -173,7 +173,35 @@ do_install_append() { # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake') rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake + # install fonts manually if they are missing + if [ ! -d ${D}/${OE_QMAKE_PATH_LIBS}/fonts ]; then + cp -a ${S}/lib/fonts ${D}/${OE_QMAKE_PATH_LIBS} + fi } -PACKAGES =. "${PN}-fonts " -FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts" +PACKAGES =. " \ + ${PN}-fonts \ + ${PN}-fonts-ttf-vera \ + ${PN}-fonts-ttf-dejavu \ + ${PN}-fonts-pfa \ + ${PN}-fonts-pfb \ + ${PN}-fonts-qpf \ +" + +RRECOMMENDS_${PN}-fonts = " \ + ${PN}-fonts-ttf-vera \ + ${PN}-fonts-ttf-dejavu \ + ${PN}-fonts-pfa \ + ${PN}-fonts-pfb \ + ${PN}-fonts-qpf \ +" + +ALLOW_EMPTY_${PN}-fonts = "1" + +FILES_${PN}-fonts-ttf-vera = "${OE_QMAKE_PATH_LIBS}/fonts/Vera*.ttf" +FILES_${PN}-fonts-ttf-dejavu = "${OE_QMAKE_PATH_LIBS}/fonts/DejaVu*.ttf" +FILES_${PN}-fonts-pfa = "${OE_QMAKE_PATH_LIBS}/fonts/*.pfa" +FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_LIBS}/fonts/*.pfb" +FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_LIBS}/fonts/*.qpf*" +FILES_${PN}-fonts = "${OE_QMAKE_PATH_LIBS}/fonts/README \ + ${OE_QMAKE_PATH_LIBS}/fonts/fontdir" From d8ce75b573a187dd2dbea51f5ff4ae6ee778b7b9 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Tue, 28 May 2013 13:24:42 +0000 Subject: [PATCH 180/347] qtjsbackend: hardfloat patch is only needed for 5.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend.inc | 1 - recipes-qt/qt5/qtjsbackend_5.0.2.bb | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index a0dc632401..4479654ed0 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -13,5 +13,4 @@ INC_PR = "r0" SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ - file://0001-Fix-hardfloat-detection.patch \ " diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb index 9dcbcc0112..0f8638ebbc 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -3,5 +3,9 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += " \ + file://0001-Fix-hardfloat-detection.patch \ + " + SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" From 49319a861790ca35d2f9c8add5a5742b243f5d3d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 15:36:00 +0200 Subject: [PATCH 181/347] qtjsbackend: refresh hardfloat patch from stable branch Signed-off-by: Martin Jansa --- .../0001-Fix-hardfloat-detection.patch | 33 --- ...p-ABI-detection.-This-work-was-trigg.patch | 190 ++++++++++++++++++ recipes-qt/qt5/qtjsbackend_5.0.2.bb | 4 +- 3 files changed, 192 insertions(+), 35 deletions(-) delete mode 100644 recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch create mode 100644 recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch diff --git a/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch b/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch deleted file mode 100644 index 3d86fbf1b2..0000000000 --- a/recipes-qt/qt5/qtjsbackend/0001-Fix-hardfloat-detection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 05a87fccb76447ce3cb4b926128af929f26469bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Wed, 22 May 2013 18:50:01 +0200 -Subject: [PATCH] Fix hardfloat detection - -based on the same patch for nodejs which says : - -gcc has a builtin define to denote hard abi when in use, e.g. when -using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore -we should check that to determine which calling convention is in use -and not __VFP_FP__ which merely indicates presence of VFP unit - -The fix has been provided by Khem Raj ---- - src/3rdparty/v8/src/platform-linux.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc -index f6db423..8ae2249 100644 ---- a/src/3rdparty/v8/src/platform-linux.cc -+++ b/src/3rdparty/v8/src/platform-linux.cc -@@ -167,7 +167,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { - // calling this will return 1.0 and otherwise 0.0. - static void ArmUsingHardFloatHelper() { - asm("mov r0, #0":::"r0"); --#if defined(__VFP_FP__) && !defined(__SOFTFP__) -+#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) - // Load 0x3ff00000 into r1 using instructions available in both ARM - // and Thumb mode. - asm("mov r1, #3":::"r1"); --- -1.7.10.4 - diff --git a/recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch b/recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch new file mode 100644 index 0000000000..a1f141411e --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch @@ -0,0 +1,190 @@ +From d8a3566b013ba581e638cf2b960a8488d5fc9d64 Mon Sep 17 00:00:00 2001 +From: Sergio Martins +Date: Wed, 20 Feb 2013 22:34:46 +0000 +Subject: [PATCH 3/3] [V8] Cleanup hardfp ABI detection. This work was + triggered by issue 2140. + +Upstream Patch: https://chromiumcodereview.appspot.com/10713009 + +Task-Number: QTBUG-28890 +Change-Id: Id073388fbbffa2ad9b1cea0ab42e1d6e47862a36 +Reviewed-by: Sean Harmer +Reviewed-by: Simon Hausmann +--- + src/3rdparty/v8/src/platform-linux.cc | 70 ++++++++++++++++------------------ + src/3rdparty/v8/src/platform-qnx.cc | 71 ++++++++++++++++------------------- + 2 files changed, 65 insertions(+), 76 deletions(-) + +diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc +index f6db423..18f59dd 100644 +--- a/src/3rdparty/v8/src/platform-linux.cc ++++ b/src/3rdparty/v8/src/platform-linux.cc +@@ -161,47 +161,41 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { + } + + +-// Simple helper function to detect whether the C code is compiled with +-// option -mfloat-abi=hard. The register d0 is loaded with 1.0 and the register +-// pair r0, r1 is loaded with 0.0. If -mfloat-abi=hard is pased to GCC then +-// calling this will return 1.0 and otherwise 0.0. +-static void ArmUsingHardFloatHelper() { +- asm("mov r0, #0":::"r0"); +-#if defined(__VFP_FP__) && !defined(__SOFTFP__) +- // Load 0x3ff00000 into r1 using instructions available in both ARM +- // and Thumb mode. +- asm("mov r1, #3":::"r1"); +- asm("mov r2, #255":::"r2"); +- asm("lsl r1, r1, #8":::"r1"); +- asm("orr r1, r1, r2":::"r1"); +- asm("lsl r1, r1, #20":::"r1"); +- // For vmov d0, r0, r1 use ARM mode. +-#ifdef __thumb__ +- asm volatile( +- "@ Enter ARM Mode \n\t" +- " adr r3, 1f \n\t" +- " bx r3 \n\t" +- " .ALIGN 4 \n\t" +- " .ARM \n" +- "1: vmov d0, r0, r1 \n\t" +- "@ Enter THUMB Mode\n\t" +- " adr r3, 2f+1 \n\t" +- " bx r3 \n\t" +- " .THUMB \n" +- "2: \n\t":::"r3"); ++bool OS::ArmUsingHardFloat() { ++ // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify ++ // the Floating Point ABI used (PCS stands for Procedure Call Standard). ++ // We use these as well as a couple of other defines to statically determine ++ // what FP ABI used. ++ // GCC versions 4.4 and below don't support hard-fp. ++ // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or ++ // __ARM_PCS_VFP. ++ ++#define GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100 \ ++ + __GNUC_PATCHLEVEL__) ++#if GCC_VERSION >= 40600 ++#if defined(__ARM_PCS_VFP) ++ return true; + #else +- asm("vmov d0, r0, r1"); +-#endif // __thumb__ +-#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) +- asm("mov r1, #0":::"r1"); +-} ++ return false; ++#endif + ++#elif GCC_VERSION < 40500 ++ return false; + +-bool OS::ArmUsingHardFloat() { +- // Cast helper function from returning void to returning double. +- typedef double (*F)(); +- F f = FUNCTION_CAST(FUNCTION_ADDR(ArmUsingHardFloatHelper)); +- return f() == 1.0; ++#else ++#if defined(__ARM_PCS_VFP) ++ return true; ++#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) ++ return false; ++#else ++#error "Your version of GCC does not report the FP ABI compiled for." \ ++ "Please report it on this issue" \ ++ "http://code.google.com/p/v8/issues/detail?id=2140" ++ ++#endif ++#endif ++#undef GCC_VERSION + } + #endif // def __arm__ + +diff --git a/src/3rdparty/v8/src/platform-qnx.cc b/src/3rdparty/v8/src/platform-qnx.cc +index bf9f5ba..46d69b8 100644 +--- a/src/3rdparty/v8/src/platform-qnx.cc ++++ b/src/3rdparty/v8/src/platform-qnx.cc +@@ -139,48 +139,43 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { + } + + +-// Simple helper function to detect whether the C code is compiled with +-// option -mfloat-abi=hard. The register d0 is loaded with 1.0 and the register +-// pair r0, r1 is loaded with 0.0. If -mfloat-abi=hard is pased to GCC then +-// calling this will return 1.0 and otherwise 0.0. +-static void ArmUsingHardFloatHelper() { +- asm("mov r0, #0"); +-#if defined(__VFP_FP__) && !defined(__SOFTFP__) +- // Load 0x3ff00000 into r1 using instructions available in both ARM +- // and Thumb mode. +- asm("mov r1, #3"); +- asm("mov r2, #255"); +- asm("lsl r1, r1, #8"); +- asm("orr r1, r1, r2"); +- asm("lsl r1, r1, #20"); +- // For vmov d0, r0, r1 use ARM mode. +-#ifdef __thumb__ +- asm volatile( +- "@ Enter ARM Mode \n\t" +- " adr r3, 1f \n\t" +- " bx r3 \n\t" +- " .ALIGN 4 \n\t" +- " .ARM \n" +- "1: vmov d0, r0, r1 \n\t" +- "@ Enter THUMB Mode\n\t" +- " adr r3, 2f+1 \n\t" +- " bx r3 \n\t" +- " .THUMB \n" +- "2: \n\t"); ++bool OS::ArmUsingHardFloat() { ++ // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify ++ // the Floating Point ABI used (PCS stands for Procedure Call Standard). ++ // We use these as well as a couple of other defines to statically determine ++ // what FP ABI used. ++ // GCC versions 4.4 and below don't support hard-fp. ++ // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or ++ // __ARM_PCS_VFP. ++ ++#define GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100 \ ++ + __GNUC_PATCHLEVEL__) ++#if GCC_VERSION >= 40600 ++#if defined(__ARM_PCS_VFP) ++ return true; + #else +- asm("vmov d0, r0, r1"); +-#endif // __thumb__ +-#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) +- asm("mov r1, #0"); +-} ++ return false; ++#endif + ++#elif GCC_VERSION < 40500 ++ return false; + +-bool OS::ArmUsingHardFloat() { +- // Cast helper function from returning void to returning double. +- typedef double (*F)(); +- F f = FUNCTION_CAST(FUNCTION_ADDR(ArmUsingHardFloatHelper)); +- return f() == 1.0; ++#else ++#if defined(__ARM_PCS_VFP) ++ return true; ++#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) ++ return false; ++#else ++#error "Your version of GCC does not report the FP ABI compiled for." \ ++ "Please report it on this issue" \ ++ "http://code.google.com/p/v8/issues/detail?id=2140" ++ ++#endif ++#endif ++#undef GCC_VERSION + } ++ + #endif // def __arm__ + + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb index 0f8638ebbc..b536da3257 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -4,8 +4,8 @@ require ${PN}.inc PR = "${INC_PR}.0" SRC_URI += " \ - file://0001-Fix-hardfloat-detection.patch \ - " + file://0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch \ +" SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" From 6f4e86b62121c94b36e89b8bd7de50099733547f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 16:55:22 +0200 Subject: [PATCH 182/347] qtbase-5.0.2: backport fix for build with gcc-4.8 Signed-off-by: Martin Jansa --- ...017-Rename-qAbs-Function-for-timeval.patch | 44 +++++++++++++++++++ recipes-qt/qt5/qtbase_5.0.2.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch new file mode 100644 index 0000000000..d6ab7637bb --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch @@ -0,0 +1,44 @@ +From 126d2c4beff40bc51a1912a752b23c178eac59b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= +Date: Sat, 23 Feb 2013 23:14:50 -0500 +Subject: [PATCH 17/17] Rename qAbs Function for timeval + +This decouples it from qAbs which is declared as a constexpr under +certain compilation flags and enables for qtbase to be compiled with +GCC 4.8 + +Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 +Reviewed-by: Thiago Macieira + +Upstream-Status: Backported from stable branch +Signed-off-by: Martin Jansa +--- + src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp +index 0eee425..7a29247 100644 +--- a/src/corelib/kernel/qtimerinfo_unix.cpp ++++ b/src/corelib/kernel/qtimerinfo_unix.cpp +@@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime() + + #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) + +-template <> +-timeval qAbs(const timeval &t) ++timeval qAbsTimeval(const timeval &t) + { + timeval tmp = t; + if (tmp.tv_sec < 0) { +@@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) + timeval tickGranularity; + tickGranularity.tv_sec = 0; + tickGranularity.tv_usec = msPerTick * 1000; +- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); ++ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); + } + + /* +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 89cfb7251a..c2cd97b636 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -5,6 +5,7 @@ PR = "${INC_PR}.0" SRC_URI += " \ file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ + file://0017-Rename-qAbs-Function-for-timeval.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" From ac8a20d754f122b8238c145ccc346cdbae1158d0 Mon Sep 17 00:00:00 2001 From: Alexander Irhin Date: Fri, 24 May 2013 11:37:02 -0700 Subject: [PATCH 183/347] qtbase: patches for WebKit hardware accelerated rendering support 0018 - Offset support for QOpenGLPaintDevice is required for speedup WebKit hardware rendering. 0019 - Fix FBO restoring in QOpenGLTextureGlyphCache Jira task 0020 - Uses right texture format to exclude extra convertion. Signed-off-by: Alexander Irhin Signed-off-by: Martin Jansa --- ...-QOpenGLPaintDevice-sub-area-support.patch | 152 ++++++++++++++++++ ...estoring-in-QOpenGLTextureGlyphCache.patch | 48 ++++++ ...20-Use-BGRA-extension-in-bindTexture.patch | 39 +++++ ...-QOpenGLPaintDevice-sub-area-support.patch | 152 ++++++++++++++++++ ...estoring-in-QOpenGLTextureGlyphCache.patch | 48 ++++++ ...20-Use-BGRA-extension-in-bindTexture.patch | 31 ++++ recipes-qt/qt5/qtbase.inc | 5 +- 7 files changed, 474 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch create mode 100644 recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch create mode 100644 recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch create mode 100644 recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch new file mode 100644 index 0000000000..9d581f8202 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -0,0 +1,152 @@ +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-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch new file mode 100644 index 0000000000..96b0a71a7c --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -0,0 +1,48 @@ +From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 +From: Valery Volgutov +Date: Tue, 21 May 2013 12:02:19 -0700 +Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache + +QOpenGLTextureGlyphCache::restoreTextureData restores FBO which +was binded before restoreTextureData call. More specifically, +it restores QOpenGLContextPrivate's current_fbo member. This works +if FBO was binded by QOpenGLFramebufferObject but not if FBO was +binded using glBindFramebufferObject and rendering done via +QOpenGLPaintDevice. + +This patch fixes it by querying current FBO using +GL_FRAMEBUFFER_BINDING query and restoring it. + +Upstream-Status: Backport +https://codereview.qt-project.org/#change,56608 + +--- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp +index 4e20f6a..3e66bad 100644 +--- a/src/gui/opengl/qopengltextureglyphcache.cpp ++++ b/src/gui/opengl/qopengltextureglyphcache.cpp +@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + return; + } + ++ GLuint saveFbo; ++ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); ++ + int oldWidth = m_textureResource->m_width; + int oldHeight = m_textureResource->m_height; + +@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + glDeleteTextures(1, &tmp_texture); + glDeleteTextures(1, &oldTexture); + +- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); ++ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); + + if (pex != 0) { + glViewport(0, 0, pex->width, pex->height); +-- +1.7.9.5 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch new file mode 100644 index 0000000000..6e8818376e --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch @@ -0,0 +1,39 @@ +From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From: Jani Hautakangas +Date: Mon, 27 May 2013 15:25:25 -0700 +Subject: [PATCH] Use BGRA extension in bindTexture + +Upstream-Status: Pending + +Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 +--- + src/gui/opengl/qopengltexturecache.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp +index 05e9bd4..a268f23 100644 +--- a/src/gui/opengl/qopengltexturecache.cpp ++++ b/src/gui/opengl/qopengltexturecache.cpp +@@ -171,7 +171,7 @@ static inline void qgl_byteSwapImage(QImage &img) + } + } + } +- ++#include + GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, const QImage &image) + { + GLuint id; +@@ -180,9 +180,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con + + QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + +- qgl_byteSwapImage(tx); +- +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); ++ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); + + int cost = tx.width() * tx.height() * 4 / 1024; + m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); +-- +1.7.9.5 + diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch new file mode 100644 index 0000000000..9d581f8202 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -0,0 +1,152 @@ +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-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch new file mode 100644 index 0000000000..96b0a71a7c --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -0,0 +1,48 @@ +From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 +From: Valery Volgutov +Date: Tue, 21 May 2013 12:02:19 -0700 +Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache + +QOpenGLTextureGlyphCache::restoreTextureData restores FBO which +was binded before restoreTextureData call. More specifically, +it restores QOpenGLContextPrivate's current_fbo member. This works +if FBO was binded by QOpenGLFramebufferObject but not if FBO was +binded using glBindFramebufferObject and rendering done via +QOpenGLPaintDevice. + +This patch fixes it by querying current FBO using +GL_FRAMEBUFFER_BINDING query and restoring it. + +Upstream-Status: Backport +https://codereview.qt-project.org/#change,56608 + +--- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp +index 4e20f6a..3e66bad 100644 +--- a/src/gui/opengl/qopengltextureglyphcache.cpp ++++ b/src/gui/opengl/qopengltextureglyphcache.cpp +@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + return; + } + ++ GLuint saveFbo; ++ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); ++ + int oldWidth = m_textureResource->m_width; + int oldHeight = m_textureResource->m_height; + +@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + glDeleteTextures(1, &tmp_texture); + glDeleteTextures(1, &oldTexture); + +- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); ++ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); + + if (pex != 0) { + glViewport(0, 0, pex->width, pex->height); +-- +1.7.9.5 + diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch new file mode 100644 index 0000000000..a35430770a --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch @@ -0,0 +1,31 @@ +From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From: Jani Hautakangas +Date: Mon, 27 May 2013 15:25:25 -0700 +Subject: [PATCH] Use BGRA extension in bindTexture + +Upstream-Status: Pending + +Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 +--- + src/gui/opengl/qopengltexturecache.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp +index 94b8288..45aad1f 100644 +--- a/src/gui/opengl/qopengltexturecache.cpp ++++ b/src/gui/opengl/qopengltexturecache.cpp +@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con + + QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + +- // Performance could be improved by skipping qgl_byteSwapImage(). +- if (m_useByteSwapImage) +- qgl_byteSwapImage(tx); +- +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); ++ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); + + int cost = tx.width() * tx.height() * 4 / 1024; + m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); +-- +1.7.9.5 diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2a5e3bc356..569332e9a9 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -16,6 +16,9 @@ SRC_URI += " \ file://0013-Disable-mkv8snapshot.patch \ file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ file://0015-qtbase-allow-build-of-examples.patch \ + file://0018-QOpenGLPaintDevice-sub-area-support.patch \ + file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ + file://0020-Use-BGRA-extension-in-bindTexture.patch \ " DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" @@ -86,7 +89,7 @@ QT_CONFIG_FLAGS += " \ ${QT_TSLIB} \ " -INC_PR = "r1" +INC_PR = "r2" # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" From 46626d15cde20c665f99c2564f01d3cd95cc0831 Mon Sep 17 00:00:00 2001 From: Janne Kiiski Date: Thu, 6 Jun 2013 17:40:40 +0300 Subject: [PATCH 184/347] qtwayland: Add temporary hack to build for Qt 5.0.2 * Append MODULE_VERSION to .qmake.conf if missing. * resolved in newer revision: commit 4d124fea48a0d094443ed0e031c8e28ec04611a3 Author: Oswald Buddenhagen Date: Tue Feb 26 12:56:57 2013 +0100 Subject: define MODULE_VERSION Signed-off-by: Janne Kiiski Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index b5119ec025..f91df4d570 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -7,3 +7,10 @@ PV = "4.999+5.0.0-beta1+git${SRCPV}" PR = "${INC_PR}.1" SRCREV = "5cb159395eccb1d96fb73a78e499eef30aacb46d" + +do_configure_prepend() { + # Temporary hack to get qtwayland build for Qt 5.0.2 + if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then + echo "MODULE_VERSION = 0.0.0" >> ${S}/.qmake.conf + fi +} From e1223d648c15aed72398b5f992d40ae03487bb32 Mon Sep 17 00:00:00 2001 From: Florian Haenel Date: Sat, 8 Jun 2013 00:49:24 +0200 Subject: [PATCH 185/347] qtdeclarative-5.0.2: Add 4 patches for runtime issues * 3 backports from newer qtdeclarative: System Hang while moving App Ribbon Fix for segfault in some ListView Cases Make use of BGRA texture format to improve image upload time * 1 pending fix: Fix for ViewTransitions not working in horizontal ListViews Signed-off-by: Florian Haenel Signed-off-by: Martin Jansa --- ...t-transition-bug-for-horizontal-case.patch | 32 +++++++ ...culation-of-viewPort-for-transitions.patch | 41 +++++++++ ...-access-in-QQuickVisualDataModelPriv.patch | 37 ++++++++ ...swizzling-on-OpenGL-ES-when-possible.patch | 88 +++++++++++++++++++ recipes-qt/qt5/qtdeclarative_5.0.2.bb | 4 + 5 files changed, 202 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch create mode 100644 recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch new file mode 100644 index 0000000000..91740ac75d --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch @@ -0,0 +1,32 @@ +From eb11863cc40048e84cb383ae9e29b5929170a63d Mon Sep 17 00:00:00 2001 +From: Guenter Schwann +Date: Wed, 27 Feb 2013 15:52:03 +0100 +Subject: [PATCH 2/5] Fix displacement transition bug for horizontal case + +Task-number: QTBUG-29944 + +Upstream-Status: Backport https://codereview.qt-project.org/49226 +Signed-off-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I23381f7a1d2c8d3c6df007b5b11c12b0db3bb1e9 +--- + src/quick/items/qquickitemview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index b73fb8c..1c74288 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -2115,7 +2115,7 @@ void QQuickItemViewPrivate::prepareVisibleItemTransitions() + return; + + // must call for every visible item to init or discard transitions +- QRectF viewBounds(0, position(), q->width(), q->height()); ++ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); + for (int i=0; iprepareTransition(transitioner, viewBounds); + } +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 0000000000..05451af506 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -0,0 +1,41 @@ +From 3dfa028b27e171cb2494b22f0346be1390310ea6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Wed, 5 Jun 2013 19:23:32 +0200 +Subject: [PATCH 3/5] Fix wrong calculation of viewPort for transitions + +Viewport is calculated wrong for horizontal layout in a second instance + +Task-number: QTBUG-29944 +Task-Number: QTBUG-31546 + +Upstream-Status: Pending + +Looks like backport of https://codereview.qt-project.org/49226 but this +one was applied in previous patch, this change looks the same but is +in different part of qquickitemview.cpp and ISN'T applied yet in dev +branch. + +Signed-off-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe +--- + src/quick/items/qquickitemview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index 1c74288..b316af9 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -1816,7 +1816,7 @@ void QQuickItemViewPrivate::layout() + + prepareVisibleItemTransitions(); + +- QRectF viewBounds(0, position(), q->width(), q->height()); ++ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); + for (QList::Iterator it = releasePendingTransition.begin(); + it != releasePendingTransition.end(); ) { + FxViewItem *item = *it; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch new file mode 100644 index 0000000000..0182248e3e --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch @@ -0,0 +1,37 @@ +From adb69cabeacbe14a4439473107000d6e94d8d033 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Mon, 3 Jun 2013 13:40:09 +0200 +Subject: [PATCH 4/5] Fix null-pointer access in QQuickVisualDataModelPrivate + +I observed null cachItem->contextData which lead to null-pointer access +on cacheItem->contextData->destroy(). + +Task-number: QTBUG-31439 + +Upstream-Status: Backport https://codereview.qt-project.org/57789 + +Signed-of-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 +--- + src/quick/items/qquickvisualdatamodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp +index d2e50e8..a460e7f 100644 +--- a/src/quick/items/qquickvisualdatamodel.cpp ++++ b/src/quick/items/qquickvisualdatamodel.cpp +@@ -817,7 +817,8 @@ void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *in + delete cacheItem->object; + cacheItem->object = 0; + cacheItem->scriptRef -= 1; +- cacheItem->contextData->destroy(); ++ if (cacheItem->contextData) ++ cacheItem->contextData->destroy(); + cacheItem->contextData = 0; + if (!cacheItem->isReferenced()) { + removeCacheItem(cacheItem); +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch b/recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch new file mode 100644 index 0000000000..92be7ef86d --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch @@ -0,0 +1,88 @@ +From 9d85c3c5823c6f73db245d4de786d911fd96edfd Mon Sep 17 00:00:00 2001 +From: Florian Haenel +Date: Sat, 8 Jun 2013 00:34:35 +0200 +Subject: [PATCH 5/5] Avoid swizzling on OpenGL ES when possible + +Add support for APPLE_texture_format_BGRA8888, +IMG_texture_format_BGRA8888, +EXT_texture_format_BGRA8888 and EXT_bgra. The apple one acts +just like the desktop EXT_bgra one, so they need slightly +different handling than the ES extensions. + +This change also has the benefit that we no longer have a dedicated +ES path. + +Upstream-Status: Backport https://codereview.qt-project.org/46549 +Signed-off-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I5ecb0a02c3a7bd984d6752fa87163726118b93de +--- + src/quick/scenegraph/util/qsgtexture.cpp | 28 ++++++++++++++++++++++------ + 1 file changed, 22 insertions(+), 6 deletions(-) + +diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp +index 16cc461..3d574f3 100644 +--- a/src/quick/scenegraph/util/qsgtexture.cpp ++++ b/src/quick/scenegraph/util/qsgtexture.cpp +@@ -65,6 +65,10 @@ + #include + #endif + ++#ifndef GL_BGRA ++#define GL_BGRA 0x80E1 ++#endif ++ + QT_BEGIN_NAMESPACE + + inline static bool isPowerOfTwo(int x) +@@ -523,7 +527,6 @@ QSGPlainTexture::~QSGPlainTexture() + glDeleteTextures(1, &m_texture_id); + } + +-#ifdef QT_OPENGL_ES + void qsg_swizzleBGRAToRGBA(QImage *image) + { + const int width = image->width(); +@@ -534,7 +537,6 @@ void qsg_swizzleBGRAToRGBA(QImage *image) + p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00); + } + } +-#endif + + void QSGPlainTexture::setImage(const QImage &image) + { +@@ -621,12 +623,26 @@ void QSGPlainTexture::bind() + + updateBindOptions(m_dirty_bind_options); + ++ GLenum externalFormat = GL_RGBA; ++ GLenum internalFormat = GL_RGBA; ++ ++ const char *extensions = (const char *) glGetString(GL_EXTENSIONS); ++ if (strstr(extensions, "GL_EXT_bgra")) { ++ externalFormat = GL_BGRA; + #ifdef QT_OPENGL_ES +- qsg_swizzleBGRAToRGBA(&tmp); +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmp.constBits()); +-#else +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_BGRA, GL_UNSIGNED_BYTE, tmp.constBits()); ++ internalFormat = GL_BGRA; + #endif ++ } else if (strstr(extensions, "GL_APPLE_texture_format_BGRA8888")) { ++ externalFormat = GL_BGRA; ++ } else if (strstr(extensions, "GL_EXT_texture_format_BGRA8888") ++ || strstr(extensions, "GL_IMG_texture_format_BGRA8888")) { ++ externalFormat = GL_BGRA; ++ internalFormat = GL_BGRA; ++ } else { ++ qsg_swizzleBGRAToRGBA(&tmp); ++ } ++ ++ glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, externalFormat, GL_UNSIGNED_BYTE, tmp.constBits()); + + if (m_has_mipmaps) { + QOpenGLContext *ctx = QOpenGLContext::currentContext(); +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb index 6f6793897a..439de99e8f 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -5,6 +5,10 @@ PR = "${INC_PR}.0" SRC_URI += " \ file://0001-qmltestexample-fix-link.patch \ + file://0002-Fix-displacement-transition-bug-for-horizontal-case.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ + file://0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ + file://0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch \ " SRC_URI[md5sum] = "55ab45a7a17db5b202b225603a35a37c" From da60ee1856a65ddcc349c5b42ae88d29e31c1e94 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Jun 2013 10:32:10 +0200 Subject: [PATCH 186/347] qtdeclarative: move 5.0.2 specific patches to own directory Signed-off-by: Martin Jansa --- .../0001-qmltestexample-fix-link.patch | 0 ...0002-Fix-displacement-transition-bug-for-horizontal-case.patch | 0 .../0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 0 ...004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch | 0 .../0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename recipes-qt/qt5/{qtdeclarative => qtdeclarative-5.0.2}/0001-qmltestexample-fix-link.patch (100%) rename recipes-qt/qt5/{qtdeclarative => qtdeclarative-5.0.2}/0002-Fix-displacement-transition-bug-for-horizontal-case.patch (100%) rename recipes-qt/qt5/{qtdeclarative => qtdeclarative-5.0.2}/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (100%) rename recipes-qt/qt5/{qtdeclarative => qtdeclarative-5.0.2}/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch (100%) rename recipes-qt/qt5/{qtdeclarative => qtdeclarative-5.0.2}/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch (100%) diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch rename to recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative/0002-Fix-displacement-transition-bug-for-horizontal-case.patch rename to recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch rename to recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch diff --git a/recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch rename to recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch diff --git a/recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch rename to recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch From e02b1ca3c2d8525d5fb3321774136978eab465c9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Jun 2013 12:24:20 +0200 Subject: [PATCH 187/347] qtdeclarative-git: Add 2 patches from 5.0.2 * 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is applied in newer SRCREV * 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still pending Signed-off-by: Martin Jansa --- ...culation-of-viewPort-for-transitions.patch | 41 +++++++++++++++++++ ...-access-in-QQuickVisualDataModelPriv.patch | 37 +++++++++++++++++ recipes-qt/qt5/qtdeclarative_git.bb | 4 ++ 3 files changed, 82 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch create mode 100644 recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 0000000000..5f201f9767 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -0,0 +1,41 @@ +From b93b61260b8eda33c01cef542777efbae2e8c570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Wed, 5 Jun 2013 19:23:32 +0200 +Subject: [PATCH 1/2] Fix wrong calculation of viewPort for transitions + +Viewport is calculated wrong for horizontal layout in a second instance + +Task-number: QTBUG-29944 +Task-Number: QTBUG-31546 + +Upstream-Status: Pending + +Looks like backport of https://codereview.qt-project.org/49226 but this +one was applied in previous patch, this change looks the same but is +in different part of qquickitemview.cpp and ISN'T applied yet in dev +branch. + +Signed-off-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe +--- + src/quick/items/qquickitemview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index d774091..aa489eb 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() + + prepareVisibleItemTransitions(); + +- QRectF viewBounds(0, position(), q->width(), q->height()); ++ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); + for (QList::Iterator it = releasePendingTransition.begin(); + it != releasePendingTransition.end(); ) { + FxViewItem *item = *it; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch new file mode 100644 index 0000000000..a61f8de23b --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch @@ -0,0 +1,37 @@ +From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Mon, 3 Jun 2013 13:40:09 +0200 +Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate + +I observed null cachItem->contextData which lead to null-pointer access +on cacheItem->contextData->destroy(). + +Task-number: QTBUG-31439 + +Upstream-Status: Backport https://codereview.qt-project.org/57789 + +Signed-of-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 +--- + src/qml/types/qqmldelegatemodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp +index 16572c4..f457538 100644 +--- a/src/qml/types/qqmldelegatemodel.cpp ++++ b/src/qml/types/qqmldelegatemodel.cpp +@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba + delete cacheItem->object; + cacheItem->object = 0; + cacheItem->scriptRef -= 1; +- cacheItem->contextData->destroy(); ++ if (cacheItem->contextData) ++ cacheItem->contextData->destroy(); + cacheItem->contextData = 0; + + if (!cacheItem->isReferenced()) { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b7f79bf2ae..e1418db516 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -3,4 +3,8 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ + file://0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ +" + SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" From 11ebf35b16cf4be024d63526862663599738541d Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Thu, 20 Jun 2013 03:54:42 +0000 Subject: [PATCH 188/347] qtbase: typo about virtual/egl depends The proper 'virtual' name for EGL is virtual/egl, not virtual/libegl, as per meta/recipes-graphics/mesa/mesa-common.inc. Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 569332e9a9..ee4094b237 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -41,7 +41,7 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm" QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" # if you want to enable egl/gles2 in your .bbappend, don't forget to add right dependencies, e.g. -# GL_DEPENDS = "virtual/libgles2 virtual/libegl" +# GL_DEPENDS = "virtual/libgles2 virtual/egl" # QT_GLFLAGS = "-opengl es2 -eglfs" GL_DEPENDS ?= "virtual/libgl" QT_GLFLAGS ?= "-opengl" From 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3 Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Wed, 26 Jun 2013 02:13:02 +0000 Subject: [PATCH 189/347] qtbase: disable fontconfig support by default Currently fontconfig support is autodetected. It is better to be deterministic. Since qtbase-fonts is not installed where fontconfig will find it, it seems that current users are not using fontconfig. Signed-off-by: Philip Craig Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index ee4094b237..f521a30225 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -21,7 +21,7 @@ SRC_URI += " \ file://0020-Use-BGRA-extension-in-bindTexture.patch \ " -DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" +DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS} ${FONTCONFIG_DEPENDS}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" @@ -52,6 +52,11 @@ QT_GLFLAGS ?= "-opengl" TSLIB_DEPENDS ?= "" QT_TSLIB ?= "-no-tslib" +# FONTCONFIG_DEPENDS = "fontconfig" +# QT_FONTCONFIG = "-fontconfig" +FONTCONFIG_DEPENDS ?= "" +QT_FONTCONFIG ?= "-no-fontconfig" + QT_WIDGETS ?= "-widgets" QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" @@ -87,6 +92,7 @@ QT_CONFIG_FLAGS += " \ ${QT_TESTS} \ ${QT_EXAMPLES} \ ${QT_TSLIB} \ + ${QT_FONTCONFIG} \ " INC_PR = "r2" From 28753fa6aacd27ea3d7f429a44ff88fe26168249 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Jun 2013 12:30:43 +0200 Subject: [PATCH 190/347] qtwebkit: Disable debug info by default Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index a25820be60..9c467dce08 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3" +# qtwebkit gets terribly big when linking with all debug info, disable by default +QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" +EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" + INC_PR = "r0" do_configure_append() { From 886509518d5662e42b1177c88403ebb31454c605 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Jul 2013 16:42:59 +0200 Subject: [PATCH 191/347] qtwayland: Add xproto dependency together with libxkbcommon * xproto provides X11/keysym.h which is used when testing libxkbcommon support: executing config test xkbcommon + cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && /OE/sysroots/x86_64-linux/usr/bin/qt5/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon + cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && make MAKEFLAGS='-j 9' OE_QMAKE_COMPILER='i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CC='i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CXX='i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types' OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden' OE_QMAKE_LINK='i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/sysroots/qemux86' OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' OE_QMAKE_AR='i586-oe-linux-ar' OE_QMAKE_STRIP='echo' OE_QMAKE_WAYLAND_SCANNER='/OE/sysroots/x86_64-linux/usr/bin/wayland-scanner' compiling /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp:42:24: fatal error: X11/keysym.h: No such file or directory compilation terminated. make: *** [.obj/release-shared/main.o] Error 1 test xkbcommon FAILED Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 0c76b993ee..7cf39351e7 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod # libxkbcommon isn't mandatory with 0001-xcbcommon-should-not-be-a-mandatory-dependency.patch # make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't # have libxkbcommon in oe-core). -XKB_DEPENDS = "libxkbcommon" +XKB_DEPENDS = "libxkbcommon xproto" DEPENDS += "qtbase qtdeclarative wayland wayland-native ${XKB_DEPENDS}" INC_PR = "r1" From b9b00aaad487fdf4a50d9e69af71742f714f6120 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Jul 2013 17:37:27 +0200 Subject: [PATCH 192/347] qmake5: Add trailing space in DEPENDS_prepend instead of QT5TOOLSDEPENDS * this way it looks better in bitbake -e, instead of: ${QT5TOOLSDEPENDS}${BASEDEPENDS} Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index a49a7895f3..e1dda0d687 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -3,8 +3,8 @@ # inherit qmake5_base -QT5TOOLSDEPENDS ?= "qtbase-native " -DEPENDS_prepend = "${QT5TOOLSDEPENDS}" +QT5TOOLSDEPENDS ?= "qtbase-native" +DEPENDS_prepend = "${QT5TOOLSDEPENDS} " # do we still need to export these? #OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" From 75291e7614115dc89045fcf6650bbdead071da03 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Sat, 6 Jul 2013 20:30:59 +0000 Subject: [PATCH 193/347] qtbase-native-5.0.2: fix compilation on Fedora 19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the patch 0017-Rename-qAbs-Function-for-timeval.patch is also needed for native else, on Fedora 19, we get : | ../../include/QtCore/../../../qtbase-opensource-src-5.0.2/src/corelib/global/qglobal.h:483:27: error: from previous declaration 'constexpr T qAbs(const T&) [with T = timeval]' | Q_DECL_CONSTEXPR inline T qAbs(const T &t) { return t >= 0 ? t : -t; } Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_5.0.2.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb index 3df434e337..623b17ad33 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.2.bb @@ -3,5 +3,9 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += " \ + file://0017-Rename-qAbs-Function-for-timeval.patch \ +" + SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" From b9fec03db878745066f91f354f82ec9c0002f34a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Jul 2013 23:28:48 +0200 Subject: [PATCH 194/347] qtbase-5.0.2: refresh patches to apply cleanly Signed-off-by: Martin Jansa --- .../0001-Add-linux-oe-g-platform.patch | 4 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 4 +- .../0003-Add-external-hostbindir-option.patch | 4 +- ...tions-temporary-remove-isEmpty-check.patch | 4 +- ...ke-is-already-built-in-qtbase-native.patch | 4 +- ...ding-a-separate-qmake-for-the-target.patch | 4 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 4 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 4 +- ...09-qt_module-Fix-paths-in-.prl-files.patch | 4 +- ...wayland-scanner-disable-silent-rules.patch | 4 +- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 4 +- ...Allow-to-add-extra-arguments-to-make.patch | 4 +- .../0013-Disable-mkv8snapshot.patch | 4 +- ...-device-to-be-read-from-env-variable.patch | 4 +- .../0015-qtbase-allow-build-of-examples.patch | 4 +- ...ib-to-be-specified-at-configure-time.patch | 4 +- ...017-Rename-qAbs-Function-for-timeval.patch | 4 +- ...-QOpenGLPaintDevice-sub-area-support.patch | 42 +++++++++---------- ...estoring-in-QOpenGLTextureGlyphCache.patch | 13 +++--- ...20-Use-BGRA-extension-in-bindTexture.patch | 10 ++--- 20 files changed, 66 insertions(+), 67 deletions(-) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index 1d74b3f644..fdd96fee6f 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/16] Add linux-oe-g++ platform +Subject: [PATCH 01/22] 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 @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index e741ca1829..f59089cfec 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/16] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/22] 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 @@ -32,5 +32,5 @@ index 5fb9640..6b40731 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index 2ade1790d1..ce27eb6b60 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/16] Add -external-hostbindir option +Subject: [PATCH 03/22] 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 @@ -217,5 +217,5 @@ index 22ee456..cfc6f97 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch index 572d25cba5..cd0ca88498 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/16] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/22] 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 - @@ -46,5 +46,5 @@ index 8a636c7..0dad97c 100644 isEmpty(MODULE):MODULE = $$TARGET -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch index b2121cf001..dd8abfa7a6 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 05/22] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -26,5 +26,5 @@ index 1ca5b4e..546bed2 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch index 97333149ad..43504c593e 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 06/22] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 0eb735c8c9..20e5e75731 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/16] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending @@ -27,5 +27,5 @@ index cfc6f97..d0e17fa 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch index dee753bbd3..83da0d2388 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/16] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -64,5 +64,5 @@ index 1132943..7fbfd8d 100644 unix|win32-g++* { -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch index b7f648394a..5687e8f1ab 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/16] qt_module: Fix paths in .prl files +Subject: [PATCH 09/22] 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 @@ -58,5 +58,5 @@ index 7fbfd8d..226119f 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch index 1e8bfb7e8b..f5b5338597 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/16] wayland-scanner: disable silent rules +Subject: [PATCH 10/22] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands @@ -42,5 +42,5 @@ index 90e1e0f..0750849 100644 +#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands QMAKE_EXTRA_COMPILERS += wayland-code -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 1cb7e007e0..a5e6a6efd3 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/16] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/22] 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 @@ -40,5 +40,5 @@ index 546bed2..34074ee 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 3346566c6a..60d4a5cc18 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/16] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/22] 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 @@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch index decdc50186..7f4d47e77a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ From 78b716520396b5317a8b91dbca183483bea8b1d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/16] Disable mkv8snapshot +Subject: [PATCH 13/22] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -42,5 +42,5 @@ index 34074ee..ac09bbf 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch index 306e13793a..d407deb41a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ From f8336efd143109c3478e5548360248f99b645548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/16] enables tslib device to be read from env variable +Subject: [PATCH 14/22] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -30,5 +30,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch index 15e96bd3eb..d824eed1f4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ From a21c676a69388cd8cdf0bb28184de2bee58def0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/16] qtbase: allow build of examples +Subject: [PATCH 15/22] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -45,5 +45,5 @@ index 479a16a..ca1b0c7 100644 - } } -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch index 387961b416..882d7de58a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch @@ -1,7 +1,7 @@ From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 26 Mar 2013 09:22:51 -0500 -Subject: [PATCH 16/16] Allow tslib to be specified at configure time. +Subject: [PATCH 16/22] Allow tslib to be specified at configure time. Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen @@ -68,5 +68,5 @@ index 078db2f..18a8295 100644 + SUBDIRS += tslib +} -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch index d6ab7637bb..78a6b48ab4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch @@ -1,7 +1,7 @@ From 126d2c4beff40bc51a1912a752b23c178eac59b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH 17/17] Rename qAbs Function for timeval +Subject: [PATCH 17/22] Rename qAbs Function for timeval This decouples it from qAbs which is declared as a constexpr under certain compilation flags and enables for qtbase to be compiled with @@ -40,5 +40,5 @@ index 0eee425..7a29247 100644 /* -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch index 9d581f8202..cbf4aed1f4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 +From c2c17a3198c85366f34b24abc80b20f27307d751 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 +Subject: [PATCH 18/22] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -10,15 +10,15 @@ 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 +- + 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 +index 0b3d9dc..5f4f1c9 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate @@ -29,7 +29,7 @@ index f0e7e49..fe9a30c 100644 QSize size; QOpenGLContext *ctx; -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) +@@ -158,6 +159,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) { } @@ -42,7 +42,7 @@ index f0e7e49..fe9a30c 100644 /*! Destroys the QOpenGLPaintDevice. */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const +@@ -226,6 +233,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const return d_ptr->ctx; } @@ -55,7 +55,7 @@ index f0e7e49..fe9a30c 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 66850c7..6f8a849 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h @@ -62,12 +62,14 @@ public: @@ -72,12 +72,12 @@ index c05571c..01eb1bc 100644 + 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 +index 9fd8a7a..df29159 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -1935,7 +1935,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -88,7 +88,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2023,7 +2026,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -97,7 +97,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2066,6 +2069,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -105,7 +105,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2074,14 +2078,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -123,10 +123,10 @@ index 0782e42..52afc60 100644 } diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index d51f0e5..0d4b38d 100644 +index 93e1b42..d84e8c7 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: +@@ -261,6 +261,7 @@ public: QOpenGL2PaintEngineEx* q; QOpenGLEngineShaderManager* shaderManager; QOpenGLPaintDevice* device; @@ -135,7 +135,7 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index b751629..8822faf 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) @@ -148,5 +148,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch index 96b0a71a7c..e47c7b6daa 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -1,7 +1,7 @@ -From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 +From edea45b25b50932c8c072679d36e97b3cc3c1326 Mon Sep 17 00:00:00 2001 From: Valery Volgutov Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache +Subject: [PATCH 19/22] Fix FBO restoring in QOpenGLTextureGlyphCache QOpenGLTextureGlyphCache::restoreTextureData restores FBO which was binded before restoreTextureData call. More specifically, @@ -15,13 +15,12 @@ GL_FRAMEBUFFER_BINDING query and restoring it. Upstream-Status: Backport https://codereview.qt-project.org/#change,56608 - --- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 4e20f6a..3e66bad 100644 +index 8822faf..022356a 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) @@ -42,7 +41,7 @@ index 4e20f6a..3e66bad 100644 + funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); + glViewport(pex->x, pex->y, pex->width, pex->height); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch index 6e8818376e..fb384f7619 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch @@ -1,17 +1,17 @@ -From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From 87380175cdb88ceadeec5773d8bc40ec08c4e3d6 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH] Use BGRA extension in bindTexture +Subject: [PATCH 20/22] Use BGRA extension in bindTexture Upstream-Status: Pending Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 --- - src/gui/opengl/qopengltexturecache.cpp | 6 ++---- + src/gui/opengl/qopengltexturecache.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 05e9bd4..a268f23 100644 +index fffc368..11c8b59 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/src/gui/opengl/qopengltexturecache.cpp @@ -171,7 +171,7 @@ static inline void qgl_byteSwapImage(QImage &img) @@ -35,5 +35,5 @@ index 05e9bd4..a268f23 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.7.9.5 +1.8.3.2 From ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 00:02:57 +0200 Subject: [PATCH 195/347] qtbase: explicitly enable or disable all deps * some options are tri-state and PACKAGECONFIG doesn't support that if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt] Signed-off-by: Martin Jansa --- ...ake-pulseaudio-a-configurable-option.patch | 36 +++++ ...gure-make-alsa-a-configurable-option.patch | 35 +++++ ...-make-freetype-a-configurable-option.patch | 35 +++++ ...ake-pulseaudio-a-configurable-option.patch | 36 +++++ ...gure-make-alsa-a-configurable-option.patch | 35 +++++ ...-make-freetype-a-configurable-option.patch | 35 +++++ recipes-qt/qt5/qtbase.inc | 146 +++++++++++------- 7 files changed, 298 insertions(+), 60 deletions(-) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch new file mode 100644 index 0000000000..3c723f6fcd --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -0,0 +1,36 @@ +From 647c9bb3a33e8cc5093d46b1a08d38f3f2002b74 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH 21/23] configure: make pulseaudio a configurable option + +Allows disabling pulseaudio support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 188e941..24dcd3a 100755 +--- a/configure ++++ b/configure +@@ -1848,6 +1848,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.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch new file mode 100644 index 0000000000..b5e0bf772b --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch @@ -0,0 +1,35 @@ +From 33a0f6ff196e366eb51dc2fb937636b087f1719f Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Fri, 19 Jul 2013 23:21:28 +0200 +Subject: [PATCH 22/23] configure: make alsa a configurable option + +Allows disabling alsa support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 24dcd3a..2f46604 100755 +--- a/configure ++++ b/configure +@@ -1855,6 +1855,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ alsa) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_ALSA="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch new file mode 100644 index 0000000000..f88bb7e0ec --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch @@ -0,0 +1,35 @@ +From 113e48ed082315424931407717b72a7a5c011944 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 20 Jul 2013 10:56:37 +0200 +Subject: [PATCH 23/23] configure: make freetype a configurable option + +Allows disabling freetype support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 2f46604..c2cf3b5 100755 +--- a/configure ++++ b/configure +@@ -1862,6 +1862,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ freetype) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then ++ CFG_LIBFREETYPE="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch new file mode 100644 index 0000000000..2fe0a18204 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -0,0 +1,36 @@ +From 1f5a36de9bb01192d3cdbcbef7a009ab4651040b Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH 21/23] configure: make pulseaudio a configurable option + +Allows disabling pulseaudio support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 96965b6..595c9d9 100755 +--- a/configure ++++ b/configure +@@ -1959,6 +1959,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.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch new file mode 100644 index 0000000000..76d1400c1e --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch @@ -0,0 +1,35 @@ +From eb93499e26486957a93b2f8f82853d3de9769cce Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Fri, 19 Jul 2013 23:21:28 +0200 +Subject: [PATCH 22/23] configure: make alsa a configurable option + +Allows disabling alsa support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 595c9d9..864967c 100755 +--- a/configure ++++ b/configure +@@ -1966,6 +1966,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ alsa) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_ALSA="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch new file mode 100644 index 0000000000..76b5835575 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch @@ -0,0 +1,35 @@ +From 6729c056b4d3ab43e59ce1c8303ae58d7c6ba8cf Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 20 Jul 2013 10:56:37 +0200 +Subject: [PATCH 23/23] configure: make freetype a configurable option + +Allows disabling freetype support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 864967c..1b4225a 100755 +--- a/configure ++++ b/configure +@@ -1973,6 +1973,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ freetype) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then ++ CFG_LIBFREETYPE="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f521a30225..f4cce29f90 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -19,80 +19,106 @@ SRC_URI += " \ file://0018-QOpenGLPaintDevice-sub-area-support.patch \ file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ file://0020-Use-BGRA-extension-in-bindTexture.patch \ + file://0021-configure-make-pulseaudio-a-configurable-option.patch \ + file://0022-configure-make-alsa-a-configurable-option.patch \ + file://0023-configure-make-freetype-a-configurable-option.patch \ " -DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS} ${FONTCONFIG_DEPENDS}" +DEPENDS += "qtbase-native" -# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h -# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" -# reenable when we switch to "-qt-xcb" and build of -# QT_XCB = "-qt-xcb" -# src/platformsupport/glxconvenience/ is resolved to be before build of -# src/plugins/platforms/xcb/ +# separate some parts of PACKAGECONFIG which are often changed +# be aware that you need to add icu to build qtwebkit, default +# PACKAGECONFIG is kept rather minimal for people who don't need +# stuff like webkit (and it's easier to add options than remove) -XCB_DEPENDS ?= "" -QT_XCB ?= "-no-xcb" +# gl or gles needs to be enabled in order to build qtdeclarative +# http://qt.gitorious.org/qt/qtdeclarative/commit/e988998a08b1420ed10bd02d9d4b3b8ed2289df9 +PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" +PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" +PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" +PACKAGECONFIG_FONTS ?= "fontconfig freetype" +PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" +PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG_DISTRO ?= "" -QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" -QT_DISTRO_FLAGS_linuxstdbase = "-sm" +PACKAGECONFIG ??= " \ + release \ + dbus \ + udev \ + evdev \ + widgets \ + openssl \ + ${PACKAGECONFIG_GL} \ + ${PACKAGECONFIG_FB} \ + ${PACKAGECONFIG_X11} \ + ${PACKAGECONFIG_FONTS} \ + ${PACKAGECONFIG_SYSTEM} \ + ${PACKAGECONFIG_MULTIMEDIA} \ + ${PACKAGECONFIG_DISTRO} \ +" -# Some can be used only for certain QT_MODULEs, so define them here, -# but add them to QT_CONFIG_FLAGS e.g. in qtbase.inc -QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" - -# if you want to enable egl/gles2 in your .bbappend, don't forget to add right dependencies, e.g. -# GL_DEPENDS = "virtual/libgles2 virtual/egl" -# QT_GLFLAGS = "-opengl es2 -eglfs" -GL_DEPENDS ?= "virtual/libgl" -QT_GLFLAGS ?= "-opengl" - -# if you want to enable tslib in your .bbappend, don't forget to add tslib dependencies -# TSLIB_DEPENDS = "tslib" -# QT_TSLIB = "-tslib" -TSLIB_DEPENDS ?= "" -QT_TSLIB ?= "-no-tslib" - -# FONTCONFIG_DEPENDS = "fontconfig" -# QT_FONTCONFIG = "-fontconfig" -FONTCONFIG_DEPENDS ?= "" -QT_FONTCONFIG ?= "-no-fontconfig" - -QT_WIDGETS ?= "-widgets" -QT_XML ?= "-xmlpatterns" -QT_WEBKIT ?= "-webkit" -QT_PHONON ?= "-phonon" -QT_DBUS ?= "-qdbus" -QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" -QT_NAS ?= "-no-nas-sound" -QT_NIS ?= "-no-nis" -QT_CUPS ?= "-no-cups" -QT_STL ?= "-stl" -QT_SYSTEM_LIBS ?= "-system-libjpeg -system-libpng -system-zlib" -QT_TESTS ?= "-nomake tests" -QT_EXAMPLES ?= "-nomake examples" -QT_RELEASE ?= "-release" +PACKAGECONFIG[release] = "-release,-debug" +PACKAGECONFIG[sm] = "-sm,-no-sm" +PACKAGECONFIG[tests] = ",-nomake tests" +PACKAGECONFIG[examples] = ",-nomake examples" +PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" +PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" +PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype" +PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" +PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" +PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" +PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" +PACKAGECONFIG[gl] = "-opengl -no-eglfs,,virtual/libgl" +PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" +PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" +PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" +PACKAGECONFIG[xcb] = "-xcb,-no-xcb,xcb-util-wm xcb-util-image xcb-util-keysyms" +PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" +PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql" +PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" +PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" +PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" +PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" +PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" +PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" +PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite,sqlite3" +PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor" +PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama" +PACKAGECONFIG[xinput] = "-xinput,-no-xinput" +PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2" +PACKAGECONFIG[xfixes] = "-xfixes,-no-xfixes,libxfixes" +PACKAGECONFIG[xrandr] = "-xrandr,-no-xrandr,libxrandr" +PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender" +PACKAGECONFIG[xshape] = "-xshape,-no-xshape" +PACKAGECONFIG[xsync] = "-xsync,-no-xsync" +PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo" +PACKAGECONFIG[openvg] = "-openvg,-no-openvg" +PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" +PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" +PACKAGECONFIG[evdev] = "-evdev,-no-evdev" +PACKAGECONFIG[gstreamer] = "-gstreamer,-no-gstreamer,gstreamer" +PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" +PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" +PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" +PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb,linuxfb" +PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" +PACKAGECONFIG[kms] = "-kms,-no-kms,kms" +PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" +PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl" +PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" +PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" +PACKAGECONFIG[nis] = "-nis,-no-nis" +PACKAGECONFIG[widgets] = "-widgets,-no-widgets" QT_CONFIG_FLAGS += " \ - ${QT_RELEASE} \ -reduce-relocations \ -shared \ -silent \ - -glib \ -no-pch \ -no-rpath \ -pkg-config \ - ${QT_WIDGETS} \ - ${QT_SYSTEM_LIBS} \ - ${QT_NIS} \ - ${QT_CUPS} \ - ${QT_SQL_DRIVER_FLAGS} \ - ${QT_DISTRO_FLAGS} \ - ${QT_XCB} \ - ${QT_GLFLAGS} \ - ${QT_TESTS} \ - ${QT_EXAMPLES} \ - ${QT_TSLIB} \ - ${QT_FONTCONFIG} \ + ${EXTRA_OECONF} \ " INC_PR = "r2" From 71cc38affe7b282fdea6f35c9876632056ef22ec Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 15:38:37 +0200 Subject: [PATCH 196/347] qtjsbackend: refresh patches, move to subdirectory Signed-off-by: Martin Jansa --- ...mkv8snapshot-tool-to-the-native-side.patch | 32 +++++++++++++++++++ ...espect-external-host-bindir-when-set.patch | 31 ++++++++++++++++++ ...p-ABI-detection.-This-work-was-trigg.patch | 2 +- ...mkv8snapshot-tool-to-the-native-side.patch | 4 +-- ...espect-external-host-bindir-when-set.patch | 4 +-- 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch create mode 100644 recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch rename recipes-qt/qt5/{qtjsbackend => qtjsbackend-5.0.2}/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch (99%) rename recipes-qt/qt5/{qtjsbackend => qtjsbackend-git}/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch (93%) rename recipes-qt/qt5/{qtjsbackend => qtjsbackend-git}/0002-v8.pro-respect-external-host-bindir-when-set.patch (93%) diff --git a/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch new file mode 100644 index 0000000000..ec0c22d0f9 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From 293e982e084661e0caf686737dcdcda9e2e3e083 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 11:20:13 -0800 +Subject: [PATCH 1/3] Install the mkv8snapshot tool to the native side + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro +index 16beb02..5e327f7 100644 +--- a/src/tools/mkv8snapshot/mkv8snapshot.pro ++++ b/src/tools/mkv8snapshot/mkv8snapshot.pro +@@ -24,5 +24,10 @@ unix:LIBS += -lpthread + + # We don't need to install this tool, it's only used for building v8. + # However we do have to make sure that 'make install' builds it. +-dummytarget.CONFIG = dummy_install +-INSTALLS += dummytarget ++#dummytarget.CONFIG = dummy_install ++#INSTALLS += dummytarget ++ ++# Install the tool so that during target cross compilation we have access to the native side binary ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target ++ +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch new file mode 100644 index 0000000000..86d841390c --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch @@ -0,0 +1,31 @@ +From fa85676a52fb6e12e6db85ace4b6a2cfc1d5239a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 02:45:01 +0200 +Subject: [PATCH 2/3] v8.pro: respect external-host-bindir, when set + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/v8/v8.pro | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/v8/v8.pro b/src/v8/v8.pro +index 2be6a19..d3da4e1 100644 +--- a/src/v8/v8.pro ++++ b/src/v8/v8.pro +@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. + include(v8.pri) + + contains(QT_CONFIG, v8snapshot) { +- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} ++ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() ++ !exists($$mkv8snapshot.tool): \ ++ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ++ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} + DUMMY_FILE = v8.pro + mkv8snapshot.input = DUMMY_FILE + mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch similarity index 99% rename from recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch rename to recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch index a1f141411e..6688d8d458 100644 --- a/recipes-qt/qt5/qtjsbackend/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch +++ b/recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch @@ -186,5 +186,5 @@ index bf9f5ba..46d69b8 100644 -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch similarity index 93% rename from recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch rename to recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch index f60e2a717e..e823b76123 100644 --- a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -1,4 +1,4 @@ -From 1539ddfc5f9c639554db98227c4d1de3b1f67792 Mon Sep 17 00:00:00 2001 +From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 11:20:13 -0800 Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side @@ -28,5 +28,5 @@ index 16beb02..5e327f7 100644 +INSTALLS += target + -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch similarity index 93% rename from recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch rename to recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch index 5ff08d2305..b0ac27d1e0 100644 --- a/recipes-qt/qt5/qtjsbackend/0002-v8.pro-respect-external-host-bindir-when-set.patch +++ b/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch @@ -1,4 +1,4 @@ -From 79deac4cdb9d223ed22a989f1d3e86fc3504c78e Mon Sep 17 00:00:00 2001 +From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 02:45:01 +0200 Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set @@ -27,5 +27,5 @@ index 2be6a19..d3da4e1 100644 mkv8snapshot.input = DUMMY_FILE mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp -- -1.8.2.1 +1.8.3.2 From ebd60ffe7e34f653532e30bfe1fad611a2b31384 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 May 2013 18:20:03 +0200 Subject: [PATCH 197/347] qtwayland: add native recipe * qtwayland fails, because we'll need to add qtwayland-native to provide qtwaylandscanner in QT_EXTERNAL_HOST_BINS location (otherwise build will try to use /usr/bin/qt5/qtwaylandscanner) * native recipe is needed to build qtwayland-scanner which is required after this upstream commit commit 05d054ad7207764293525661876ebc689940a15c Author: Samuel Rdal Date: Tue Apr 9 16:52:59 2013 +0200 Introduced qtwaylandscanner. Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland-native.inc | 22 +++++++++++++ recipes-qt/qt5/qtwayland-native_git.bb | 7 ++++ ...ylandscanner-tool-to-the-native-side.patch | 32 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland-native.inc create mode 100644 recipes-qt/qt5/qtwayland-native_git.bb create mode 100644 recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc new file mode 100644 index 0000000000..4aa82c361a --- /dev/null +++ b/recipes-qt/qt5/qtwayland-native.inc @@ -0,0 +1,22 @@ +require qt5-native.inc + +LICENSE = "BSD & LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ + file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ +" + +QT_MODULE = "${BPN}" + +DEPENDS = "qtbase-native wayland-native" + +SRC_URI += " \ + file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ +" + +do_configure() { + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}/src/qtwaylandscanner +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb new file mode 100644 index 0000000000..090faafa80 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -0,0 +1,7 @@ +require qt5-git.inc +require ${PN}.inc + +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +PV = "4.999+5.0.0-beta1+git${SRCPV}" + +SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch new file mode 100644 index 0000000000..1fac95b7fe --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Fri, 19 Jul 2013 13:35:14 +0000 +Subject: [PATCH] Install the qtwaylandscanner tool to the native side + +Upstream-Status: Inappropiate [configuration] + +Signed-off-by: Simon Busch +--- + src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro +index ac2d07b..53b93f9 100644 +--- a/src/qtwaylandscanner/qtwaylandscanner.pro ++++ b/src/qtwaylandscanner/qtwaylandscanner.pro +@@ -1,6 +1,10 @@ + option(host_build) + +-SOURCES += qtwaylandscanner.cpp ++TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() ++CONFIG += console warn_off ++QT = core + +-load(qt_tool) ++SOURCES += qtwaylandscanner.cpp + ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target +-- +1.8.1.2 + From ca4a0758e17c69905df6eda86fe678a4f10f50f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 18:12:24 +0200 Subject: [PATCH 198/347] qmake5_base: add override for HostLibraries * qtdeclarative was using /usr/lib as HostLibraries causing WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used. Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information. DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib * also without this fix qtdeclarative and qtwayland are trying to build tools against /usr/lib/libQt5Bootstrap.a (without sysroot prefix) Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 1 + classes/qmake5_paths.bbclass | 1 + 2 files changed, 2 insertions(+) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8ff9565abe..04518ef418 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -73,6 +73,7 @@ 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} diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 67707addda..8f1857f058 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -20,6 +20,7 @@ OE_QMAKE_PATH_TESTS = "${datadir}/tests" OE_QMAKE_PATH_HOST_PREFIX = "" OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" +OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" # for qt5 components we're using QT_DIR_NAME subdirectory in more From 902f55b957ba0407816739bfcae864c6bd2c3d68 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Jul 2013 16:14:44 +0200 Subject: [PATCH 199/347] qt5: add recipes for 5.1.0 * only rebased patches and updated SRC_URI checksum, haven't even build tested it yet Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 4 +- recipes-qt/qt5/qt5-5.1.0.inc | 22 ++ recipes-qt/qt5/qt5.inc | 1 + .../0001-Add-linux-oe-g-platform.patch | 304 ++++++++++++++++++ .../qtbase-5.1.0/0001-Always-build-uic.patch | 40 +++ ...ow-to-set-qt.conf-from-the-outside-u.patch | 36 +++ .../0003-Add-external-hostbindir-option.patch | 218 +++++++++++++ ...tions-temporary-remove-isEmpty-check.patch | 51 +++ ...ke-is-already-built-in-qtbase-native.patch | 30 ++ ...ding-a-separate-qmake-for-the-target.patch | 29 ++ ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 ++ ...-qt_module-Fix-pkgconfig-replacement.patch | 70 ++++ ...09-qt_module-Fix-paths-in-.prl-files.patch | 62 ++++ ...wayland-scanner-disable-silent-rules.patch | 82 +++++ ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 +++ ...Allow-to-add-extra-arguments-to-make.patch | 37 +++ .../0013-Disable-mkv8snapshot.patch | 47 +++ ...-device-to-be-read-from-env-variable.patch | 35 ++ .../0015-qtbase-allow-build-of-examples.patch | 48 +++ ...-QOpenGLPaintDevice-sub-area-support.patch | 154 +++++++++ ...estoring-in-QOpenGLTextureGlyphCache.patch | 49 +++ ...20-Use-BGRA-extension-in-bindTexture.patch | 34 ++ ...ake-pulseaudio-a-configurable-option.patch | 36 +++ ...gure-make-alsa-a-configurable-option.patch | 35 ++ ...-make-freetype-a-configurable-option.patch | 35 ++ recipes-qt/qt5/qtbase-native_5.1.0.bb | 11 + recipes-qt/qt5/qtbase_5.1.0.bb | 5 + .../0001-qmltestexample-fix-link.patch | 46 +++ ...culation-of-viewPort-for-transitions.patch | 41 +++ recipes-qt/qt5/qtdeclarative_5.1.0.bb | 15 + recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb | 5 + recipes-qt/qt5/qtimageformats_5.1.0.bb | 5 + ...mkv8snapshot-tool-to-the-native-side.patch | 32 ++ ...espect-external-host-bindir-when-set.patch | 31 ++ recipes-qt/qt5/qtjsbackend-native_5.1.0.bb | 5 + recipes-qt/qt5/qtjsbackend_5.1.0.bb | 5 + recipes-qt/qt5/qtmultimedia_5.1.0.bb | 5 + recipes-qt/qt5/qtquick1_5.1.0.bb | 5 + recipes-qt/qt5/qtscript_5.1.0.bb | 5 + recipes-qt/qt5/qtsensors_5.1.0.bb | 5 + recipes-qt/qt5/qtsvg_5.1.0.bb | 5 + recipes-qt/qt5/qtwebkit_5.1.0.bb | 5 + recipes-qt/qt5/qtxmlpatterns_5.1.0.bb | 5 + 43 files changed, 1767 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qt5-5.1.0.inc create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch create mode 100644 recipes-qt/qt5/qtbase-native_5.1.0.bb create mode 100644 recipes-qt/qt5/qtbase_5.1.0.bb create mode 100644 recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch create mode 100644 recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch create mode 100644 recipes-qt/qt5/qtdeclarative_5.1.0.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.1.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch create mode 100644 recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.1.0.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.1.0.bb create mode 100644 recipes-qt/qt5/qtquick1_5.1.0.bb create mode 100644 recipes-qt/qt5/qtscript_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsensors_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsvg_5.1.0.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.1.0.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.0.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 01a5a25aef..f033a20a78 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.2", "5.0.2+git%" +# possible values now "5.0.2", "5.0.2+git%", "5.1.0%" QT5_VERSION ?= "5.0.2" @@ -12,7 +12,9 @@ PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}" PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" +PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" +PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/qt5-5.1.0.inc b/recipes-qt/qt5/qt5-5.1.0.inc new file mode 100644 index 0000000000..e26cc05344 --- /dev/null +++ b/recipes-qt/qt5/qt5-5.1.0.inc @@ -0,0 +1,22 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. +# Copyright (C) 2013 Martin Jansa + +QT_VERSION ?= "${PV}" + +# it's different for RC versions +QT_VERSION_DIR ?= "5.1" + +# less tested then 5.0.2 or git recipes +DEFAULT_PREFERENCE = "-2" + +SRC_URI += " \ + http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 87bf5e8f18..80acb73e39 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -67,6 +67,7 @@ FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_IMPORTS}/*/*/*/qmldir \ " + FILES_${PN}-tools = " \ ${OE_QMAKE_PATH_BINS}/* \ " diff --git a/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch new file mode 100644 index 0000000000..669dffcd60 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch @@ -0,0 +1,304 @@ +From 7244ed3ca9326f3521de8961dbe7f9759f8e8041 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 15 Apr 2013 04:29:32 +0200 +Subject: [PATCH 01/23] 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 + +* 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: Pending + +Signed-off-by: Martin Jansa +--- + configure | 54 ++++++++++++++++--- + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ + mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ + 3 files changed, 187 insertions(+), 7 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 d7c9674..45e0586 100755 +--- a/configure ++++ b/configure +@@ -284,6 +284,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 +@@ -293,6 +303,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" + for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" +@@ -2836,7 +2868,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then + CFG_QGTKSTYLE=no + fi + +-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` ++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` + + TEST_COMPILER=$QMAKE_CONF_COMPILER + +@@ -2871,7 +2903,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 +@@ -3909,6 +3941,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..." +@@ -3947,11 +3987,11 @@ 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_CXXFLAGS +- setBootstrapVariable QMAKE_LFLAGS ++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" ++ setBootstrapEvalVariable QMAKE_CFLAGS ++ setBootstrapEvalVariable QMAKE_CXXFLAGS ++ setBootstrapEvalVariable QMAKE_LFLAGS + + if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then + setBootstrapVariable QMAKE_CFLAGS_RELEASE +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 +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch new file mode 100644 index 0000000000..5f37a971d6 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch @@ -0,0 +1,40 @@ +From 28cb656a49b80364f4bfc4387849f1e9ac56fbf2 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] 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. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index b4c9602..f30ec1f 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions + src_plugins.depends += src_gui src_platformsupport + !contains(QT_CONFIG, no-widgets) { +- SUBDIRS += src_tools_uic src_widgets ++ SUBDIRS += src_widgets + src_plugins.depends += src_widgets + contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += src_opengl +@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + } + } + } +-SUBDIRS += src_plugins src_tools_qdoc ++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 0000000000..c9c663a3d7 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,36 @@ +From 6eb6d141309bc5a42218fbc755545ead70a88b55 Mon Sep 17 00:00:00 2001 +From: Holger Freyther +Date: Wed, 26 Sep 2012 17:22:30 +0200 +Subject: [PATCH 02/23] 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, 4 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index 1eaebe5..bda2ffe 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -138,7 +138,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(); +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch new file mode 100644 index 0000000000..751275ed41 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch @@ -0,0 +1,218 @@ +From 253db5565b402dfc0b2abbcc813d6ac32eecef96 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 6 Apr 2013 13:15:07 +0200 +Subject: [PATCH 03/23] 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 15 ++++++++++++++- + mkspecs/features/qt_functions.prf | 5 ++++- + mkspecs/features/qt_tool.prf | 2 +- + qmake/property.cpp | 1 + + qtbase.pro | 12 +++++++++--- + src/corelib/global/qlibraryinfo.cpp | 3 ++- + src/corelib/global/qlibraryinfo.h | 1 + + tools/configure/configureapp.cpp | 8 ++++++++ + 8 files changed, 40 insertions(+), 7 deletions(-) + +diff --git a/configure b/configure +index 45e0586..dbe7360 100755 +--- a/configure ++++ b/configure +@@ -1038,6 +1038,7 @@ QT_HOST_PREFIX= + QT_HOST_BINS= + QT_HOST_LIBS= + QT_HOST_DATA= ++QT_EXTERNAL_HOST_BINS= + + #flags for SQL drivers + QT_CFLAGS_PSQL= +@@ -1145,7 +1146,7 @@ while [ "$#" -gt 0 ]; do + VAL=no + ;; + #Qt style options that pass an argument +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1333,6 +1334,9 @@ while [ "$#" -gt 0 ]; do + hostlibdir) + QT_HOST_LIBS="$VAL" + ;; ++ external-hostbindir) ++ QT_EXTERNAL_HOST_BINS="$VAL" ++ ;; + pkg-config) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PKGCONFIG="$VAL" +@@ -3190,6 +3194,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" + fi + ++# 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 ++ + #------------------------------------------------------------------------------- + # help - interactive parts of the script _after_ this section please + #------------------------------------------------------------------------------- +@@ -3358,6 +3367,9 @@ 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 +@@ -3873,6 +3885,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { + "qt_hbinpath=$QT_HOST_BINS", + "qt_hlibpath=$QT_HOST_LIBS", + "qt_hdatpath=$QT_HOST_DATA", ++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", + "qt_targspec=$shortxspec", + "qt_hostspec=$shortspec", + #endif +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index bbbb5d3..d581367 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { + defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) + isEmpty($$1) { +- $$1 = $$[QT_HOST_BINS]/$$2 ++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 ++ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ $$1 = $$[QT_HOST_BINS]/$$2 ++ } + exists($$eval($$1).pl) { + $$1 = perl -w $$eval($$1).pl + } else: contains(QMAKE_HOST.os, Windows) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 9a6b963..83ef3a0 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -16,7 +16,7 @@ CONFIG += console + # 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$, ) +diff --git a/qmake/property.cpp b/qmake/property.cpp +index 4685440..93eb1d4 100644 +--- a/qmake/property.cpp ++++ b/qmake/property.cpp +@@ -75,6 +75,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/qtbase.pro b/qtbase.pro +index 6ab032e..38872b6 100644 +--- a/qtbase.pro ++++ b/qtbase.pro +@@ -68,16 +68,22 @@ CONFIG -= qt + + #qmake + qmake.path = $$[QT_HOST_BINS] ++qmake.files = $$OUT_PWD/bin/qmake ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 + + #syncqt + syncqt.path = $$[QT_HOST_BINS] + syncqt.files = $$PWD/bin/syncqt.pl ++syncqt.files = $$PWD/bin/syncqt.pl ++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl ++} + INSTALLS += syncqt + + # If we are doing a prefix build, create a "module" pri which enables +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index bda2ffe..530aea9 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() + */ + + static const struct { +- char key[19], value[13]; ++ char key[21], value[13]; + } qtConfEntries[] = { + { "Prefix", "." }, + { "Documentation", "doc" }, // should be ${Data}/doc +@@ -296,6 +296,7 @@ static const struct { + { "HostBinaries", "bin" }, + { "HostLibraries", "lib" }, + { "HostData", "." }, ++ { "ExternalHostBinaries", "" }, + { "TargetSpec", "" }, + { "HostSpec", "" }, + #endif +diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h +index b275e01..0e6baed 100644 +--- a/src/corelib/global/qlibraryinfo.h ++++ b/src/corelib/global/qlibraryinfo.h +@@ -84,6 +84,7 @@ public: + HostBinariesPath, + HostLibrariesPath, + HostDataPath, ++ ExternalHostBinariesPath, + TargetSpecPath, + HostSpecPath, + LastHostPath = HostSpecPath, +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index f92fad1..8f0bd0e 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -1161,6 +1161,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_HOST_DATA" ] = 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) +@@ -3752,6 +3759,7 @@ void Configure::generateQConfigCpp() + << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl + << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl ++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl + << " \"qt_targspec=" << targSpec << "\"," << endl + << " \"qt_hostspec=" << hostSpec << "\"," << endl + << "#endif" << endl +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 0000000000..4fe10871bb --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,51 @@ +From ad252e21f737536027aebbf63217188a80d108ba Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 04/23] 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]. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 3 +-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index d581367..2bc6533 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } + exists($$eval($$1).pl) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 83ef3a0..21c9eb7 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -15,8 +15,7 @@ CONFIG += console + + # 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):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { + isEmpty(MODULE):MODULE = $$TARGET + + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 0000000000..69b1435811 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From bd7521ebc01feedde14e3e5e037ebd66b994db06 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 05/23] 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 dbe7360..f8f0e9a 100755 +--- a/configure ++++ b/configure +@@ -3963,7 +3963,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.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 0000000000..363a8ee944 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 00997b0cf46d6b6c362c48ee31f886c553a3fb4f Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 06/23] 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.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 0000000000..97b1269c3f --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,29 @@ +From 662115f5e837fc397533810ca659af0f66749ce4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Upstream-Status: Pending +--- + 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 8f0bd0e..f7ff15c 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 0000000000..2de710372f --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,70 @@ +From 1db1ad1ef3c57f531bf67be33a4cc43528864543 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement + +* 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 53a5499..9dfc1dd 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -140,18 +140,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + } + + unix { + CONFIG += create_libtool explicitlib +- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace + } + + unix|win32-g++* { +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 0000000000..f9e6c64ecc --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,62 @@ +From 036a2be171a0bf6fea5eaa7383e19f2559a37dce Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 09/23] 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 9dfc1dd..5cedb8f 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -144,17 +144,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 0000000000..bdbb52a1d9 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,82 @@ +From c441038a17c1173c8abafd451c4083b2eccc54ab Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 10/23] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 2ec064f..847d0f7 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES + wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES + wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES + wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code + + qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) +@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS + qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands ++#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-header + + qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES + qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp + qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands ++#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-code + + qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} +@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS + qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands ++#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-header + + qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES + qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp + qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands ++#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-code +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 0000000000..7c1e44590a --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,44 @@ +From 7a24e90118a0d81d76b68d3bd0dafcad0966e49e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 11/23] 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index f8f0e9a..3c80d5f 100755 +--- a/configure ++++ b/configure +@@ -842,20 +842,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 0000000000..66df3688ff --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,37 @@ +From b115685d8c684181a0af79e44a1d170a5a8bfd05 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 12/23] 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index b4569df..d189e50 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # 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) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch new file mode 100644 index 0000000000..0a50ee0d44 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch @@ -0,0 +1,47 @@ +From 7455bfff17483c19d7eef3ad81a95f6996ff0ce8 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 8 Jan 2013 15:58:29 -0800 +Subject: [PATCH 13/23] Disable mkv8snapshot + +It seems to generate code that throws SIGILL, so disabling it + +Program received signal SIGILL, Illegal instruction. +0x26312c60 in ?? () +(gdb) bt + function=..., receiver=..., argc=1978934572, args=0x7efff254, + has_pending_exception=0x7efff277, qml=...) + at ../3rdparty/v8/src/execution.cc:125 + argc=1, argv=0x7efff254, pending_exception=0x7efff277, + convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 + receiver=, argc=, argv=, + pending_exception=0x7efff277, convert_receiver=false) + at ../3rdparty/v8/src/execution.cc:161 + data=, exc=0x7efff277) + at ../3rdparty/v8/src/execution.cc:734 + at ../3rdparty/v8/src/api.cc:4742 + at qml/v8/qv8contextwrapper.cpp:155 + ownership=) at qml/v8/qv8engine.cpp:155 + parent=) at qml/v8/qjsengine.cpp:192 + +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 3c80d5f..50dbebf 100755 +--- a/configure ++++ b/configure +@@ -902,7 +902,7 @@ CFG_SKIP_MODULES="" + CFG_COMPILE_EXAMPLES=auto + CFG_RELEASE_QMAKE=no + CFG_AUDIO_BACKEND=auto +-CFG_V8SNAPSHOT=auto ++CFG_V8SNAPSHOT=no + CFG_QML_DEBUG=yes + CFG_JAVASCRIPTCORE_JIT=auto + CFG_PKGCONFIG=auto +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch new file mode 100644 index 0000000000..38b1e65995 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -0,0 +1,35 @@ +From 6da394a759ada8c3dcc6649dbbdf89918d675ae7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Mon, 27 May 2013 18:32:37 +0200 +Subject: [PATCH 14/23] enables tslib device to be read from env variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +from : +https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch + +Signed-off-by: Eric Bénard +Signed-off-by: Martin Jansa +--- + src/plugins/generic/tslib/qtslib.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp +index 6986fd5..2ed4a69 100644 +--- a/src/plugins/generic/tslib/qtslib.cpp ++++ b/src/plugins/generic/tslib/qtslib.cpp +@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, + qDebug() << "QTsLibMouseHandler" << key << specification; + setObjectName(QLatin1String("TSLib Mouse Handler")); + +- QByteArray device = "/dev/input/event1"; ++ QByteArray device = qgetenv("TSLIB_TSDEVICE"); ++ if(device.isEmpty()) ++ device = "/dev/input/event1"; + if (specification.startsWith("/dev/")) + device = specification.toLocal8Bit(); + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch new file mode 100644 index 0000000000..068467a697 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch @@ -0,0 +1,48 @@ +From 94a5ed9c22ed927123df3007d426de5d19e4f692 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sat, 25 May 2013 17:34:32 +0200 +Subject: [PATCH 15/23] qtbase: allow build of examples +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this revert the following commit : + +commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 +Author: Oswald Buddenhagen +Date: Fri Dec 21 19:36:12 2012 +0100 + + do not actually build examples in production builds + + -developer-build enables an actual build of examples, based on the + assumption that developers want to test it (it can be still disabled + with -nomake examples). regular users otoh want only the examples + sources installed. + + Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 + Reviewed-by: Joerg Bornemann + +Signed-off-by: Eric Bénard +--- + mkspecs/features/qt_example_installs.prf | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 2db752c..ca1b0c7 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) + allfiles -= doc + !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") + } +- +- !equals(TEMPLATE, subdirs):!compile_examples { +- TEMPLATE = aux +- CONFIG -= have_target qt staticlib dll +- SOURCES = +- INSTALLS -= target +- } + } +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch new file mode 100644 index 0000000000..2069fffb5c --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -0,0 +1,154 @@ +From 41a9c47ca820502d98039273f7465605464cdf9c Mon Sep 17 00:00:00 2001 +From: Jani Hautakangas +Date: Thu, 16 May 2013 09:52:07 +0300 +Subject: [PATCH 18/23] 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 | 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.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch new file mode 100644 index 0000000000..c3a9dd5449 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -0,0 +1,49 @@ +From 7c4453b5203e908f0c851c2a34231d81eb2f73c2 Mon Sep 17 00:00:00 2001 +From: Valery Volgutov +Date: Tue, 21 May 2013 12:02:19 -0700 +Subject: [PATCH 19/23] Fix FBO restoring in QOpenGLTextureGlyphCache + +QOpenGLTextureGlyphCache::restoreTextureData restores FBO which +was binded before restoreTextureData call. More specifically, +it restores QOpenGLContextPrivate's current_fbo member. This works +if FBO was binded by QOpenGLFramebufferObject but not if FBO was +binded using glBindFramebufferObject and rendering done via +QOpenGLPaintDevice. + +This patch fixes it by querying current FBO using +GL_FRAMEBUFFER_BINDING query and restoring it. + +Upstream-Status: Backport +https://codereview.qt-project.org/#change,56608 + +Signed-off-by: Martin Jansa +--- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp +index ec29900..9bda1db 100644 +--- a/src/gui/opengl/qopengltextureglyphcache.cpp ++++ b/src/gui/opengl/qopengltextureglyphcache.cpp +@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + return; + } + ++ GLuint saveFbo; ++ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); ++ + int oldWidth = m_textureResource->m_width; + int oldHeight = m_textureResource->m_height; + +@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + glDeleteTextures(1, &tmp_texture); + glDeleteTextures(1, &oldTexture); + +- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); ++ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); + + if (pex != 0) { + glViewport(pex->x, pex->y, pex->width, pex->height); +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch new file mode 100644 index 0000000000..e081e69a47 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch @@ -0,0 +1,34 @@ +From fb16e96ffef959e45c9cbcbef4cc4f51065f2e47 Mon Sep 17 00:00:00 2001 +From: Jani Hautakangas +Date: Mon, 27 May 2013 15:25:25 -0700 +Subject: [PATCH 20/23] Use BGRA extension in bindTexture + +Upstream-Status: Pending + +Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 + +Signed-off-by: Martin Jansa +--- + src/gui/opengl/qopengltexturecache.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp +index 94b8288..5c8aa3c 100644 +--- a/src/gui/opengl/qopengltexturecache.cpp ++++ b/src/gui/opengl/qopengltexturecache.cpp +@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con + + QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + +- // Performance could be improved by skipping qgl_byteSwapImage(). +- if (m_useByteSwapImage) +- qgl_byteSwapImage(tx); +- +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); ++ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); + + int cost = tx.width() * tx.height() * 4 / 1024; + m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch new file mode 100644 index 0000000000..797f258b82 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -0,0 +1,36 @@ +From 9f79c8047289b9c5bff025a46757bfd5f9bfec4b Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH 21/23] configure: make pulseaudio a configurable option + +Allows disabling pulseaudio support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 50dbebf..3b511d4 100755 +--- a/configure ++++ b/configure +@@ -1980,6 +1980,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.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch new file mode 100644 index 0000000000..5fe40805f7 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch @@ -0,0 +1,35 @@ +From a51b5c64a33a0c8b411aa4317356c7dfcb99e452 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Fri, 19 Jul 2013 23:21:28 +0200 +Subject: [PATCH 22/23] configure: make alsa a configurable option + +Allows disabling alsa support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 3b511d4..2a0be04 100755 +--- a/configure ++++ b/configure +@@ -1987,6 +1987,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ alsa) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_ALSA="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch new file mode 100644 index 0000000000..d8ad4b8273 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch @@ -0,0 +1,35 @@ +From eef64dc5f4d998518c314a765bc0a9db7f6fdf9b Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 20 Jul 2013 10:56:37 +0200 +Subject: [PATCH 23/23] configure: make freetype a configurable option + +Allows disabling freetype support at configure time. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure b/configure +index 2a0be04..64fbaeb 100755 +--- a/configure ++++ b/configure +@@ -1994,6 +1994,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ freetype) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then ++ CFG_LIBFREETYPE="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-native_5.1.0.bb b/recipes-qt/qt5/qtbase-native_5.1.0.bb new file mode 100644 index 0000000000..563e000ee4 --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.1.0.bb @@ -0,0 +1,11 @@ +require qt5-${PV}.inc +require ${PN}.inc + +do_install_append() { + # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) + # e.g. qt3d, qtjsondb, qtwayland + ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt +} + +SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" +SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb new file mode 100644 index 0000000000..b55546418c --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" +SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch new file mode 100644 index 0000000000..7a68dd53e9 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch @@ -0,0 +1,46 @@ +From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sun, 26 May 2013 14:26:19 +0200 +Subject: [PATCH 1/3] qmltestexample: fix link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get : +ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found + +Upstream-Status: Inappropriate + +Signed-off-by: Eric Bénard +--- + examples/qmltest/qmltest/qmltest.pro | 2 +- + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5..1b00e6c 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml + # This code exists solely for the purpose of building this example + # inside the examples/ hierarchy. + +-QT += qml qmltest ++QT += qml qmltest quick + + macx: CONFIG -= app_bundle + +diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro +index 5184c1f..668cf17 100644 +--- a/tools/qmltestrunner/qmltestrunner.pro ++++ b/tools/qmltestrunner/qmltestrunner.pro +@@ -1,5 +1,5 @@ + SOURCES += main.cpp + +-QT += qml qmltest ++QT += qml qmltest quick + + load(qt_tool) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 0000000000..d355e4880c --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -0,0 +1,41 @@ +From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= +Date: Wed, 5 Jun 2013 19:23:32 +0200 +Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions + +Viewport is calculated wrong for horizontal layout in a second instance + +Task-number: QTBUG-29944 +Task-Number: QTBUG-31546 + +Upstream-Status: Pending + +Looks like backport of https://codereview.qt-project.org/49226 but this +one was applied in previous patch, this change looks the same but is +in different part of qquickitemview.cpp and ISN'T applied yet in dev +branch. + +Signed-off-by: Florian Haenel +Signed-off-by: Martin Jansa + +Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe +--- + src/quick/items/qquickitemview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index a6dabee..290f283 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() + + prepareVisibleItemTransitions(); + +- QRectF viewBounds(0, position(), q->width(), q->height()); ++ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); + for (QList::Iterator it = releasePendingTransition.begin(); + it != releasePendingTransition.end(); ) { + FxViewItem *item = *it; +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtdeclarative_5.1.0.bb b/recipes-qt/qt5/qtdeclarative_5.1.0.bb new file mode 100644 index 0000000000..2421bdbf9c --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.1.0.bb @@ -0,0 +1,15 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ +" + +SRC_URI[md5sum] = "604a6e3ae051a21aac0024694d55cb3b" +SRC_URI[sha256sum] = "d8849755c17fca9bb44c09c442001bc5593c24986ea616c536719414e85d90cc" + +# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ +" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb new file mode 100644 index 0000000000..3d24d7ab17 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0e38ef686197fbf1207a9510f07d0656" +SRC_URI[sha256sum] = "ea30ed7c3523d1a800a63cb888096cef89c61b590bfc81ba815ab9b12e283a89" diff --git a/recipes-qt/qt5/qtimageformats_5.1.0.bb b/recipes-qt/qt5/qtimageformats_5.1.0.bb new file mode 100644 index 0000000000..b7a8b08ddb --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "6dfab2e481e90ce74e89c646b91a11ca" +SRC_URI[sha256sum] = "c740442a46715e32a45f60e42fda76afd8430bf0004ee1f7147aa77cf92ed846" diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch new file mode 100644 index 0000000000..1f94e4cee1 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 11:20:13 -0800 +Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro +index 16beb02..5e327f7 100644 +--- a/src/tools/mkv8snapshot/mkv8snapshot.pro ++++ b/src/tools/mkv8snapshot/mkv8snapshot.pro +@@ -24,5 +24,10 @@ unix:LIBS += -lpthread + + # We don't need to install this tool, it's only used for building v8. + # However we do have to make sure that 'make install' builds it. +-dummytarget.CONFIG = dummy_install +-INSTALLS += dummytarget ++#dummytarget.CONFIG = dummy_install ++#INSTALLS += dummytarget ++ ++# Install the tool so that during target cross compilation we have access to the native side binary ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target ++ +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch new file mode 100644 index 0000000000..d9bb5b4399 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch @@ -0,0 +1,31 @@ +From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 02:45:01 +0200 +Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + src/v8/v8.pro | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/v8/v8.pro b/src/v8/v8.pro +index 2be6a19..d3da4e1 100644 +--- a/src/v8/v8.pro ++++ b/src/v8/v8.pro +@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. + include(v8.pri) + + contains(QT_CONFIG, v8snapshot) { +- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} ++ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() ++ !exists($$mkv8snapshot.tool): \ ++ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ++ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} + DUMMY_FILE = v8.pro + mkv8snapshot.input = DUMMY_FILE + mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb new file mode 100644 index 0000000000..fcc7cde617 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" +SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce" diff --git a/recipes-qt/qt5/qtjsbackend_5.1.0.bb b/recipes-qt/qt5/qtjsbackend_5.1.0.bb new file mode 100644 index 0000000000..fcc7cde617 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" +SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce" diff --git a/recipes-qt/qt5/qtmultimedia_5.1.0.bb b/recipes-qt/qt5/qtmultimedia_5.1.0.bb new file mode 100644 index 0000000000..97ef3ba60f --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "ae0301809ca504b4b67d817fd46f9a2e" +SRC_URI[sha256sum] = "1df262e4d8d16f83511a096974a5a14af21d366493c5302d549e3dc52fa0b00f" diff --git a/recipes-qt/qt5/qtquick1_5.1.0.bb b/recipes-qt/qt5/qtquick1_5.1.0.bb new file mode 100644 index 0000000000..c29f96ed0c --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0c4c7b81258dd889e020b6025f542387" +SRC_URI[sha256sum] = "51d83033c2012de9806be13434b48430401c395c0d0a58390ada290581b3fc5f" diff --git a/recipes-qt/qt5/qtscript_5.1.0.bb b/recipes-qt/qt5/qtscript_5.1.0.bb new file mode 100644 index 0000000000..d9bd00fc81 --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "c9348cdc39826c717c75b930a7b5a3bf" +SRC_URI[sha256sum] = "0cbe2e472657673ec8bd2f1ad133140b498292065159e67355f427e903c46d9b" diff --git a/recipes-qt/qt5/qtsensors_5.1.0.bb b/recipes-qt/qt5/qtsensors_5.1.0.bb new file mode 100644 index 0000000000..9d314eae47 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "bcb4b546d1d39f2e27425b48bae90ac2" +SRC_URI[sha256sum] = "5cfd74323e8145a282fe840c47c639c064e832263744a24270f326a1464830ee" diff --git a/recipes-qt/qt5/qtsvg_5.1.0.bb b/recipes-qt/qt5/qtsvg_5.1.0.bb new file mode 100644 index 0000000000..b54484dfaa --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "394d33cc5d6b7aafbaae5a4f1d9e6652" +SRC_URI[sha256sum] = "50fc66ada43472e42245c18095e9eac84b496a634736cf55aac81326e4aad54a" diff --git a/recipes-qt/qt5/qtwebkit_5.1.0.bb b/recipes-qt/qt5/qtwebkit_5.1.0.bb new file mode 100644 index 0000000000..77725e3b94 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "fad7e7d6637719c2be101f9b3957d451" +SRC_URI[sha256sum] = "b49c4cfae697ea67142e7b35ecb0e3fec06814153e8226b8c6655c4dafc92ac3" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb new file mode 100644 index 0000000000..f054159516 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "1d1ebc4d6efa4d05368c0c716858d314" +SRC_URI[sha256sum] = "9d06493a4387d19e561f79f79c0a9c4c333eb764d64af54dc05f13a978694537" From 507c7466ea3a7b10a72b57ce06c3bf1ddd769037 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 15:13:32 +0200 Subject: [PATCH 200/347] qt5: bump SRCREVs in git recipes to 5.1.0+ * patches will now be closer to 5.1.0 release Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 4 +- recipes-qt/qt5/qt5-git.inc | 2 +- .../0001-Add-linux-oe-g-platform.patch | 22 ++-- .../qtbase-git/0001-Always-build-uic.patch | 4 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 8 +- .../0003-Add-external-hostbindir-option.patch | 106 +++++++++--------- ...tions-temporary-remove-isEmpty-check.patch | 18 +-- ...ke-is-already-built-in-qtbase-native.patch | 10 +- ...ding-a-separate-qmake-for-the-target.patch | 10 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 10 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 22 ++-- ...09-qt_module-Fix-paths-in-.prl-files.patch | 10 +- ...wayland-scanner-disable-silent-rules.patch | 6 +- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 10 +- ...Allow-to-add-extra-arguments-to-make.patch | 6 +- .../0013-Disable-mkv8snapshot.patch | 12 +- ...-device-to-be-read-from-env-variable.patch | 6 +- .../0015-qtbase-allow-build-of-examples.patch | 17 ++- ...-QOpenGLPaintDevice-sub-area-support.patch | 34 +++--- ...estoring-in-QOpenGLTextureGlyphCache.patch | 48 -------- ...20-Use-BGRA-extension-in-bindTexture.patch | 15 ++- ...ake-pulseaudio-a-configurable-option.patch | 6 +- ...gure-make-alsa-a-configurable-option.patch | 6 +- ...-make-freetype-a-configurable-option.patch | 6 +- recipes-qt/qt5/qtbase-native_git.bb | 8 +- recipes-qt/qt5/qtbase.inc | 1 - recipes-qt/qt5/qtbase_5.0.2.bb | 1 + recipes-qt/qt5/qtbase_5.1.0.bb | 4 + recipes-qt/qt5/qtbase_git.bb | 4 +- .../0001-qmltestexample-fix-link.patch | 46 ++++++++ ...-access-in-QQuickVisualDataModelPriv.patch | 37 ------ ...ulation-of-viewPort-for-transitions.patch} | 8 +- recipes-qt/qt5/qtdeclarative_git.bb | 9 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 +- recipes-qt/qt5/qtimageformats_git.bb | 4 +- recipes-qt/qt5/qtjsbackend-native_git.bb | 4 +- recipes-qt/qt5/qtjsbackend_git.bb | 4 +- recipes-qt/qt5/qtmultimedia_git.bb | 4 +- recipes-qt/qt5/qtquick1_git.bb | 4 +- recipes-qt/qt5/qtscript_git.bb | 4 +- recipes-qt/qt5/qtsensors_git.bb | 7 +- recipes-qt/qt5/qtsvg_git.bb | 4 +- recipes-qt/qt5/qtwebkit_git.bb | 4 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 4 +- 44 files changed, 253 insertions(+), 310 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch create mode 100644 recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch rename recipes-qt/qt5/qtdeclarative-git/{0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch => 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch} (89%) diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index f033a20a78..b946a6a62d 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.2", "5.0.2+git%", "5.1.0%" +# possible values now "5.0.2", "5.1.0", "5.1.0+git%" QT5_VERSION ?= "5.0.2" @@ -17,4 +17,4 @@ PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" -PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" +PREFERRED_VERSION_qtwayland = "${QT5_VERSION}%" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 9733a48940..987704726f 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.0.2+git${SRCPV}" +PV = "5.1.0+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 942cc9cb4e..5c16ece59c 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 +From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/15] Add linux-oe-g++ platform +Subject: [PATCH 01/23] 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 @@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 9c86fa1..7dea731 100755 +index 938b23b..dacfd30 100755 --- a/configure +++ b/configure -@@ -284,6 +284,16 @@ getQMakeConf() +@@ -291,6 +291,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -61,7 +61,7 @@ index 9c86fa1..7dea731 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -293,6 +303,16 @@ getXQMakeConf() +@@ -300,6 +310,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -78,7 +78,7 @@ index 9c86fa1..7dea731 100755 compilerSupportsFlag() { cat >conftest.cpp <> "$mkfile" } @@ -130,7 +130,7 @@ index 9c86fa1..7dea731 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3922,11 +3962,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4005,11 +4045,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch index a0810bcc50..e02815b1fc 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch @@ -1,4 +1,4 @@ -From ebe1148e38c5deb3c67dc041e68cd1623531d67b Mon Sep 17 00:00:00 2001 +From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 27 Nov 2012 12:46:44 -0800 Subject: [PATCH] Always build uic @@ -36,5 +36,5 @@ index b4c9602..f30ec1f 100644 nacl: SUBDIRS -= src_network src_testlib -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index e1087f2a12..9f301c4636 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 +From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/15] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/23] 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 @@ -16,7 +16,7 @@ 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 5fb9640..6b40731 100644 +index 53a3ebb..8ca2102 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -32,5 +32,5 @@ index 5fb9640..6b40731 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 0b98683e63..b80189f375 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ -From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 +From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/15] Add -external-hostbindir option +Subject: [PATCH 03/23] 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 @@ -12,40 +12,39 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa --- - configure | 15 ++++++++++++++- + configure | 14 ++++++++++++++ mkspecs/features/qt_functions.prf | 5 ++++- mkspecs/features/qt_tool.prf | 2 +- qmake/property.cpp | 1 + - qtbase.pro | 15 +++++++++++---- + qtbase.pro | 12 +++++++++--- src/corelib/global/qlibraryinfo.cpp | 3 ++- src/corelib/global/qlibraryinfo.h | 1 + tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 42 insertions(+), 8 deletions(-) + 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index 7dea731..65f4d26 100755 +index dacfd30..25980c0 100755 --- a/configure +++ b/configure -@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" - QT_HOST_PREFIX= +@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= QT_HOST_BINS= + QT_HOST_LIBS= QT_HOST_DATA= +QT_EXTERNAL_HOST_BINS= #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -1141,7 +1142,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style options that pass an argument -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1326,6 +1327,9 @@ while [ "$#" -gt 0 ]; do - hostbindir) - QT_HOST_BINS="$VAL" +@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do + -testsdir| \ + -hostdatadir| \ + -hostbindir| \ ++ -external-hostbindir| \ + -hostlibdir| \ + -sysroot| \ + -depths| \ +@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do + hostlibdir) + QT_HOST_LIBS="$VAL" ;; + external-hostbindir) + QT_EXTERNAL_HOST_BINS="$VAL" @@ -53,8 +52,8 @@ index 7dea731..65f4d26 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -3180,6 +3184,11 @@ else - QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` +@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi +# default is empty, don't call makeabs if it is empty @@ -65,7 +64,7 @@ index 7dea731..65f4d26 100755 #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please #------------------------------------------------------------------------------- -@@ -3346,6 +3355,9 @@ Installation options: +@@ -3416,6 +3426,9 @@ Installation options: -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -75,32 +74,32 @@ index 7dea731..65f4d26 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3855,6 +3867,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { - "qt_hpfxpath=$QT_HOST_PREFIX", +@@ -3931,6 +3944,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", + "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", + "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", "qt_targspec=$shortxspec", "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 8cd2473..876f657 100644 +index 2f2c94c..4e12d3d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { +@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) + $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { - $$1 = $$[QT_HOST_BINS]/$$2 + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 + isEmpty($$[QT_EXTERNAL_HOST_BINS]) { + $$1 = $$[QT_HOST_BINS]/$$2 + } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { - exists($$eval($$1).bat) { - $$1 = $$eval($$1).bat + exists($$eval($$1).pl) { + $$1 = perl -w $$eval($$1).pl + } else: contains(QMAKE_HOST.os, Windows) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 0a58880..c110ea5 100644 +index 9a6b963..83ef3a0 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -16,7 +16,7 @@ CONFIG += console @@ -111,24 +110,24 @@ index 0a58880..c110ea5 100644 +!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) diff --git a/qmake/property.cpp b/qmake/property.cpp -index c4fbcd6..c1b7a9f 100644 +index 4685440..93eb1d4 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp -@@ -74,6 +74,7 @@ static const struct { - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, +@@ -75,6 +75,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/qtbase.pro b/qtbase.pro -index 4c41cff..997ea6d 100644 +index d6726b5..28ca7d5 100644 --- a/qtbase.pro +++ b/qtbase.pro -@@ -68,17 +68,24 @@ CONFIG -= qt +@@ -70,16 +70,22 @@ CONFIG -= qt #qmake qmake.path = $$[QT_HOST_BINS] @@ -146,19 +145,16 @@ index 4c41cff..997ea6d 100644 #syncqt syncqt.path = $$[QT_HOST_BINS] - syncqt.files = $$PWD/bin/syncqt --equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat + syncqt.files = $$PWD/bin/syncqt.pl ++syncqt.files = $$PWD/bin/syncqt.pl +!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt -+} -+equals(QMAKE_HOST.os, Windows) { -+ syncqt.files = $${syncqt.files}.bat ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl +} INSTALLS += syncqt # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6b40731..139a60f 100644 +index 8ca2102..9f5d444 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() @@ -170,31 +166,31 @@ index 6b40731..139a60f 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -295,6 +295,7 @@ static const struct { - { "HostPrefix", "" }, +@@ -296,6 +296,7 @@ static const struct { { "HostBinaries", "bin" }, + { "HostLibraries", "lib" }, { "HostData", "." }, + { "ExternalHostBinaries", "" }, { "TargetSpec", "" }, { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 1a00a14..7e4829c 100644 +index b275e01..0e6baed 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h -@@ -83,6 +83,7 @@ public: - HostPrefixPath, +@@ -84,6 +84,7 @@ public: HostBinariesPath, + HostLibrariesPath, HostDataPath, + ExternalHostBinariesPath, TargetSpecPath, HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index a18aac3..57409b1 100644 +index 5b62e8f..c752df3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine() +@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); } @@ -208,14 +204,14 @@ index a18aac3..57409b1 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp() - << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl +@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl + << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl << " \"qt_targspec=" << targSpec << "\"," << endl << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch index 77b1c41fb4..ccb8a093a7 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ -From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 +From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/23] 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 - @@ -16,11 +16,11 @@ Signed-off-by: Martin Jansa 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 +index 4e12d3d..e20ad9d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 - isEmpty($$[QT_EXTERNAL_HOST_BINS]) { @@ -31,9 +31,9 @@ index 876f657..0e094a8 100644 + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { $$1 = $$[QT_HOST_BINS]/$$2 } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).pl) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index c110ea5..34ee9ca 100644 +index 83ef3a0..21c9eb7 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -15,8 +15,7 @@ CONFIG += console @@ -45,7 +45,7 @@ index c110ea5..34ee9ca 100644 +!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index d95e0b4538..7bd2ba6bab 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 +From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/15] qmake is already built in qtbase-native +Subject: [PATCH 05/23] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 65f4d26..dbf99a9 100755 +index 25980c0..74f9e65 100755 --- a/configure +++ b/configure -@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() +@@ -4022,7 +4022,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index 65f4d26..dbf99a9 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch index a8778469d2..d074c3da39 100644 --- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 +From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/15] Allow building a separate qmake for the target +Subject: [PATCH 06/23] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 +index a81d0cd..ed7aebf 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic +@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ PROEVALUATOR_FULL PROEVALUATOR_DEBUG DESTDIR = ../bin/ @@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index f873aae976..4562fe15ee 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ -From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 +From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 57409b1..f443007 100644 +index c752df3..0d1bca6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() +@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection @@ -25,5 +25,5 @@ index 57409b1..f443007 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 4d15ee06f8..f855292c09 100644 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 +From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -23,14 +23,14 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa --- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 3531d28..1c43972 100644 +index 7f7de85..7741b96 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -136,18 +136,30 @@ unix|win32-g++* { +@@ -140,18 +140,30 @@ unix|win32-g++* { rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR @@ -41,8 +41,9 @@ index 3531d28..1c43972 100644 include_replace.match = $$rplbase/include include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] + lafile_replace.match = $$rplbase + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" + @@ -57,12 +58,13 @@ index 3531d28..1c43972 100644 unix { CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace ++ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace } unix|win32-g++* { -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 8a3ef3c136..c1e80bc276 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 +From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/15] qt_module: Fix paths in .prl files +Subject: [PATCH 09/23] 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 @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1c43972..feec2d5 100644 +index 7741b96..3874067 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -140,17 +140,23 @@ unix|win32-g++* { +@@ -144,17 +144,23 @@ unix|win32-g++* { pkgconfig_include_replace.replace = "\$$\\{includedir}" pkgconfig_lib_replace.match = $$rplbase/lib pkgconfig_lib_replace.replace = "\$$\\{libdir}" @@ -58,5 +58,5 @@ index 1c43972..feec2d5 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch index 5b14c81813..749edeee53 100644 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ -From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 +From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/15] wayland-scanner: disable silent rules +Subject: [PATCH 10/23] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands @@ -78,5 +78,5 @@ index 2ec064f..847d0f7 100644 +#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands QMAKE_EXTRA_COMPILERS += qtwayland-server-code -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 2c2360e654..6117e7fb86 100644 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ -From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 +From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/23] 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 @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index dbf99a9..9ca23a4 100755 +index 74f9e65..7a9a77c 100755 --- a/configure +++ b/configure -@@ -840,20 +840,7 @@ fi'` +@@ -849,20 +849,7 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" @@ -40,5 +40,5 @@ index dbf99a9..9ca23a4 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index e6602b435b..e0a216673a 100644 --- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ -From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 +From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/15] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/23] 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 @@ -33,5 +33,5 @@ index b4569df..d189e50 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch index cd0c059689..32982662a2 100644 --- a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ -From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001 +From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/15] Disable mkv8snapshot +Subject: [PATCH 13/23] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -30,11 +30,11 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 9ca23a4..96965b6 100755 +index 7a9a77c..69e30b5 100755 --- a/configure +++ b/configure -@@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS="" - CFG_SKIP_MODULES="" +@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" + CFG_COMPILE_EXAMPLES=auto CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto -CFG_V8SNAPSHOT=auto @@ -43,5 +43,5 @@ index 9ca23a4..96965b6 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch index e55ac7a37e..a2dc5fb83e 100644 --- a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ -From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001 +From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/15] enables tslib device to be read from env variable +Subject: [PATCH 14/23] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch index 45a49a6240..9cf0641984 100644 --- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ -From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 +From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/15] qtbase: allow build of examples +Subject: [PATCH 15/23] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -24,20 +24,19 @@ Date: Fri Dec 21 19:36:12 2012 +0100 Signed-off-by: Eric Bénard --- - mkspecs/features/qt_example_installs.prf | 8 -------- - 1 file changed, 8 deletions(-) + mkspecs/features/qt_example_installs.prf | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 479a16a..ca1b0c7 100644 +index 2db752c..ca1b0c7 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) +@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) allfiles -= doc !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") } - -- # Do not actually build the examples in production builds with -prefix -- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { +- !equals(TEMPLATE, subdirs):!compile_examples { - TEMPLATE = aux - CONFIG -= have_target qt staticlib dll - SOURCES = @@ -45,5 +44,5 @@ index 479a16a..ca1b0c7 100644 - } } -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch index 9d581f8202..e26d237fd6 100644 --- a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 +From b485950725b776bc1f0cf4edd5330d61732262cb 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 +Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -9,12 +9,14 @@ 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 | 10 +++++++--- - src/gui/opengl/qopenglpaintengine_p.h | 1 + - src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- + 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 @@ -74,10 +76,10 @@ index c05571c..01eb1bc 100644 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 +index 78f5080..20db620 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -88,7 +90,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -97,7 +99,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -105,7 +107,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -135,11 +137,11 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index 7d49c03..d9eb3fe 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); +@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); @@ -148,5 +150,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch deleted file mode 100644 index 96b0a71a7c..0000000000 --- a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 -From: Valery Volgutov -Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache - -QOpenGLTextureGlyphCache::restoreTextureData restores FBO which -was binded before restoreTextureData call. More specifically, -it restores QOpenGLContextPrivate's current_fbo member. This works -if FBO was binded by QOpenGLFramebufferObject but not if FBO was -binded using glBindFramebufferObject and rendering done via -QOpenGLPaintDevice. - -This patch fixes it by querying current FBO using -GL_FRAMEBUFFER_BINDING query and restoring it. - -Upstream-Status: Backport -https://codereview.qt-project.org/#change,56608 - ---- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 4e20f6a..3e66bad 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - return; - } - -+ GLuint saveFbo; -+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); -+ - int oldWidth = m_textureResource->m_width; - int oldHeight = m_textureResource->m_height; - -@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - glDeleteTextures(1, &tmp_texture); - glDeleteTextures(1, &oldTexture); - -- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); -+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); - - if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); --- -1.7.9.5 - diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch index a35430770a..5919bbadab 100644 --- a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch +++ b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch @@ -1,17 +1,19 @@ -From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH] Use BGRA extension in bindTexture +Subject: [PATCH 20/23] Use BGRA extension in bindTexture Upstream-Status: Pending Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 + +Signed-off-by: Martin Jansa --- - src/gui/opengl/qopengltexturecache.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + src/gui/opengl/qopengltexturecache.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 94b8288..45aad1f 100644 +index 94b8288..5c8aa3c 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/src/gui/opengl/qopengltexturecache.cpp @@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con @@ -28,4 +30,5 @@ index 94b8288..45aad1f 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.7.9.5 +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch index 2fe0a18204..f259284ceb 100644 --- a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -1,4 +1,4 @@ -From 1f5a36de9bb01192d3cdbcbef7a009ab4651040b Mon Sep 17 00:00:00 2001 +From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Feb 2012 15:10:24 +0000 Subject: [PATCH 21/23] configure: make pulseaudio a configurable option @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 96965b6..595c9d9 100755 +index 69e30b5..290b9ac 100755 --- a/configure +++ b/configure -@@ -1959,6 +1959,13 @@ while [ "$#" -gt 0 ]; do +@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch index 76d1400c1e..3513a171d3 100644 --- a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch @@ -1,4 +1,4 @@ -From eb93499e26486957a93b2f8f82853d3de9769cce Mon Sep 17 00:00:00 2001 +From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Jul 2013 23:21:28 +0200 Subject: [PATCH 22/23] configure: make alsa a configurable option @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 595c9d9..864967c 100755 +index 290b9ac..5e9bfd4 100755 --- a/configure +++ b/configure -@@ -1966,6 +1966,13 @@ while [ "$#" -gt 0 ]; do +@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch index 76b5835575..f141725fb7 100644 --- a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch @@ -1,4 +1,4 @@ -From 6729c056b4d3ab43e59ce1c8303ae58d7c6ba8cf Mon Sep 17 00:00:00 2001 +From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 10:56:37 +0200 Subject: [PATCH 23/23] configure: make freetype a configurable option @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 864967c..1b4225a 100755 +index 5e9bfd4..5b1f5f2 100755 --- a/configure +++ b/configure -@@ -1973,6 +1973,13 @@ while [ "$#" -gt 0 ]; do +@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 71177825a7..0db74da8ab 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,6 +1,10 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" +do_install_append() { + # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) + # e.g. qt3d, qtjsondb, qtwayland + ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt +} -SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" +SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f4cce29f90..0e091235be 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -17,7 +17,6 @@ SRC_URI += " \ file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ file://0015-qtbase-allow-build-of-examples.patch \ file://0018-QOpenGLPaintDevice-sub-area-support.patch \ - file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ file://0020-Use-BGRA-extension-in-bindTexture.patch \ file://0021-configure-make-pulseaudio-a-configurable-option.patch \ file://0022-configure-make-alsa-a-configurable-option.patch \ diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index c2cd97b636..15ac3718ad 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -6,6 +6,7 @@ PR = "${INC_PR}.0" SRC_URI += " \ file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ file://0017-Rename-qAbs-Function-for-timeval.patch \ + file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb index b55546418c..54e2da94a9 100644 --- a/recipes-qt/qt5/qtbase_5.1.0.bb +++ b/recipes-qt/qt5/qtbase_5.1.0.bb @@ -1,5 +1,9 @@ require qt5-${PV}.inc require ${PN}.inc +SRC_URI += " \ + file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ +" + SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 71177825a7..2994d3fae9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" +SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch new file mode 100644 index 0000000000..7a68dd53e9 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch @@ -0,0 +1,46 @@ +From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sun, 26 May 2013 14:26:19 +0200 +Subject: [PATCH 1/3] qmltestexample: fix link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get : +ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found + +Upstream-Status: Inappropriate + +Signed-off-by: Eric Bénard +--- + examples/qmltest/qmltest/qmltest.pro | 2 +- + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5..1b00e6c 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml + # This code exists solely for the purpose of building this example + # inside the examples/ hierarchy. + +-QT += qml qmltest ++QT += qml qmltest quick + + macx: CONFIG -= app_bundle + +diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro +index 5184c1f..668cf17 100644 +--- a/tools/qmltestrunner/qmltestrunner.pro ++++ b/tools/qmltestrunner/qmltestrunner.pro +@@ -1,5 +1,5 @@ + SOURCES += main.cpp + +-QT += qml qmltest ++QT += qml qmltest quick + + load(qt_tool) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch deleted file mode 100644 index a61f8de23b..0000000000 --- a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= -Date: Mon, 3 Jun 2013 13:40:09 +0200 -Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate - -I observed null cachItem->contextData which lead to null-pointer access -on cacheItem->contextData->destroy(). - -Task-number: QTBUG-31439 - -Upstream-Status: Backport https://codereview.qt-project.org/57789 - -Signed-of-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 ---- - src/qml/types/qqmldelegatemodel.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp -index 16572c4..f457538 100644 ---- a/src/qml/types/qqmldelegatemodel.cpp -+++ b/src/qml/types/qqmldelegatemodel.cpp -@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba - delete cacheItem->object; - cacheItem->object = 0; - cacheItem->scriptRef -= 1; -- cacheItem->contextData->destroy(); -+ if (cacheItem->contextData) -+ cacheItem->contextData->destroy(); - cacheItem->contextData = 0; - - if (!cacheItem->isReferenced()) { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch similarity index 89% rename from recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch rename to recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch index 5f201f9767..84f8f66106 100644 --- a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -1,7 +1,7 @@ -From b93b61260b8eda33c01cef542777efbae2e8c570 Mon Sep 17 00:00:00 2001 +From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20H=C3=A4nel?= Date: Wed, 5 Jun 2013 19:23:32 +0200 -Subject: [PATCH 1/2] Fix wrong calculation of viewPort for transitions +Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions Viewport is calculated wrong for horizontal layout in a second instance @@ -24,7 +24,7 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index d774091..aa489eb 100644 +index a6dabee..290f283 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() @@ -37,5 +37,5 @@ index d774091..aa489eb 100644 it != releasePendingTransition.end(); ) { FxViewItem *item = *it; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e1418db516..407dd886b6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,10 +1,9 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRC_URI += "file://0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ - file://0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " -SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" +SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 199214877e..3f0f8790a3 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "bd434a6ea358e96c373e3ad65bfb6d939904abf5" +SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 08f9bd3eba..1bb88ae0b7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "f293cc8539da5d4ea915c957abbba473515793ad" +SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98" diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb index f825b9935e..29e97c499b 100644 --- a/recipes-qt/qt5/qtjsbackend-native_git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" +SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb index f825b9935e..29e97c499b 100644 --- a/recipes-qt/qt5/qtjsbackend_git.bb +++ b/recipes-qt/qt5/qtjsbackend_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" +SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 207424b9a9..d1eced6cda 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "07f20b8afe6976d69359c27278cbda2c4d0a47c7" +SRCREV = "c74b544610376c753ea0a29ff2465e2bcfe70e1d" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 717a999993..1d4a7253e8 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "31c3dec9fe1341d412830eb1163e252112f9765c" +SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ceccb9712c..4328b583d2 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "15f8b3a5f8623d5230865e2fd9811c986a91f7e6" +SRCREV = "a8e3602554c3225046a831cad7a727a56501439b" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7d3e766365..7d082a1d32 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,9 +1,4 @@ require qt5-git.inc require ${PN}.inc -# qtsensors wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" - -PR = "${INC_PR}.0" - -SRCREV = "a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f" +SRCREV = "0862901b142f36e91b98dbdcb2c36585020bb33d" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 735c34467b..fef5ecdb0d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "04959ec43e93877348c41ff1d36916993948e43d" +SRCREV = "a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 1b0737a700..ebfc56c788 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "a2e31061d4a24fceb4d32f4df301150ee1cc8af1" +SRCREV = "c31ff44d3a17fab37754acb2a0a29cd6eba10699" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 1277e3465e..e824b8e7c4 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "3ca482d01c07ee25213533b31a3ad626c224d95e" +SRCREV = "808c59c00f23109d1887022c2d9a6f4e5ecc72a4" From 5eb22ffbfafc558a66943e666c415a9749a39e2b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 14:39:37 +0200 Subject: [PATCH 201/347] qtwayland: add second recipe with latest SRCREV, compatible with qt5 5.1.0 Signed-off-by: Martin Jansa --- ...should-not-be-a-mandatory-dependency.patch | 46 ++++++++++++ ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 33 +++++++++ ...eKHR-requires-the-context-to-be-NULL.patch | 71 +++++++++++++++++++ ...ylandscanner-tool-to-the-native-side.patch | 0 ...should-not-be-a-mandatory-dependency.patch | 0 ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 0 ...eKHR-requires-the-context-to-be-NULL.patch | 0 ...d-precision-qualifier-in-fragment-sh.patch | 0 recipes-qt/qt5/qtwayland-native_git.bb | 4 +- recipes-qt/qt5/qtwayland.inc | 3 - recipes-qt/qt5/qtwayland_5.1.0+git.bb | 15 ++++ recipes-qt/qt5/qtwayland_git.bb | 12 +++- 12 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch create mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch create mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch rename recipes-qt/qt5/{qtwayland => qtwayland-git}/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch (100%) rename recipes-qt/qt5/{qtwayland => qtwayland-git}/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch (100%) rename recipes-qt/qt5/{qtwayland => qtwayland-git}/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch (100%) rename recipes-qt/qt5/{qtwayland => qtwayland-git}/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch (100%) rename recipes-qt/qt5/{qtwayland => qtwayland-git}/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch (100%) create mode 100644 recipes-qt/qt5/qtwayland_5.1.0+git.bb diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch new file mode 100644 index 0000000000..0571ea5e83 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch @@ -0,0 +1,46 @@ +From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 19 Feb 2013 11:16:05 -0800 +Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency + +Not all platforms that use qtwayland depend on xcbcommon to be present +for them to be functional + +This change won't be needed when this commit from dev branch is merged +to stable: +commit 894adf8a447865119be7c6c4d01577d8032f4177 +Author: Oswald Buddenhagen +Date: Mon Apr 8 12:54:58 2013 +0200 + +make failure to configure wayland non-fatal for a top-level build of qt + +Signed-off-by: Martin Jansa +--- + qtwayland.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtwayland.pro b/qtwayland.pro +index 24e104b..66dd38a 100644 +--- a/qtwayland.pro ++++ b/qtwayland.pro +@@ -11,7 +11,7 @@ qtCompileTest(xcomposite) + load(qt_parts) + + !config_wayland { +- error(QtWayland requires Wayland 1.0.3 or higher) ++ error("QtWayland requires Wayland 1.0.3 or higher") + } + + !config_xkbcommon { +@@ -19,7 +19,7 @@ load(qt_parts) + } + + !config_wayland_scanner { +- error(QtWayland requires wayland-scanner) ++ error("QtWayland requires wayland-scanner") + } + + !config_wayland_egl { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch new file mode 100644 index 0000000000..771729086f --- /dev/null +++ b/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch @@ -0,0 +1,33 @@ +From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Fri, 1 Mar 2013 13:00:53 -0800 +Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have + qtHaveModule + +Signed-off-by: Martin Jansa +--- + src/compositor/compositor_api/compositor_api.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri +index f0bbe76..e7905e5 100644 +--- a/src/compositor/compositor_api/compositor_api.pri ++++ b/src/compositor/compositor_api/compositor_api.pri +@@ -12,7 +12,7 @@ SOURCES += \ + + QT += core-private + +-qtHaveModule(quick) { ++#qtHaveModule(quick) { + SOURCES += \ + compositor_api/qwaylandsurfaceitem.cpp \ + compositor_api/qwaylandsurfacenode.cpp \ +@@ -27,4 +27,4 @@ qtHaveModule(quick) { + + QT += qml quick + QT += quick-private gui-private +-} ++#} +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch new file mode 100644 index 0000000000..58f82663f2 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch @@ -0,0 +1,71 @@ +From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Wed, 6 Mar 2013 10:18:49 -0800 +Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL + +As per the EGL spec the context passed to that function should +be null. + +Signed-off-by: Martin Jansa +--- + .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +index 73877c4..16e77fb 100644 +--- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp ++++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +@@ -101,7 +101,6 @@ public: + + PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; + +- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; + }; + + WaylandEglIntegration::WaylandEglIntegration() +@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla + const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); + if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) + { +- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); +- if (!d->get_egl_context) { +- qWarning("Failed to retrieve the get_egl_context function"); +- } + d->egl_bind_wayland_display = + reinterpret_cast(eglGetProcAddress("eglBindWaylandDisplayWL")); + d->egl_unbind_wayland_display = +@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla + reinterpret_cast(eglGetProcAddress("glEGLImageTargetTexture2DOES")); + + if (d->egl_bind_wayland_display +- && d->get_egl_context + && d->egl_unbind_wayland_display + && d->egl_create_image + && d->egl_destroy_image +@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL + return 0; + } + +- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); +- EGLContext egl_context = d->get_egl_context(context); +- +- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, ++ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, + EGL_WAYLAND_BUFFER_WL, + buffer, NULL); + +@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC + { + Q_D(const WaylandEglIntegration); + +- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); +- EGLContext egl_context = d->get_egl_context(context); +- +- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, ++ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, + EGL_WAYLAND_BUFFER_WL, + buffer, NULL); + return image; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch similarity index 100% rename from recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch rename to recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch diff --git a/recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch similarity index 100% rename from recipes-qt/qt5/qtwayland/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch rename to recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch diff --git a/recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch similarity index 100% rename from recipes-qt/qt5/qtwayland/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch rename to recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch diff --git a/recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch similarity index 100% rename from recipes-qt/qt5/qtwayland/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch rename to recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch diff --git a/recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch b/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch similarity index 100% rename from recipes-qt/qt5/qtwayland/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch rename to recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 090faafa80..20cd2519c2 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -2,6 +2,8 @@ require qt5-git.inc require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" +# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 +# while qtwayland_git stays compatible with 5.0.2 +PV = "5.1.0+git${SRCPV}" SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 7cf39351e7..3ae98edebe 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -13,13 +13,10 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod XKB_DEPENDS = "libxkbcommon xproto" DEPENDS += "qtbase qtdeclarative wayland wayland-native ${XKB_DEPENDS}" -INC_PR = "r1" - SRC_URI += " \ file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ - file://0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch \ " QT_WAYLAND_CONFIG ?= "wayland-compositor" diff --git a/recipes-qt/qt5/qtwayland_5.1.0+git.bb b/recipes-qt/qt5/qtwayland_5.1.0+git.bb new file mode 100644 index 0000000000..aaa439cf80 --- /dev/null +++ b/recipes-qt/qt5/qtwayland_5.1.0+git.bb @@ -0,0 +1,15 @@ +require qt5-git.inc +require ${PN}.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-5.1.0+git:" + +DEPENDS += "qtwayland-native" + +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 +# while qtwayland_git stays compatible with 5.0.2 +PV = "5.1.0+git${SRCPV}" + +# newer revisions depend on newer wayland-1.1 APIs +SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3" +# SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index f91df4d570..170b3673ec 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,13 +1,19 @@ require qt5-git.inc require ${PN}.inc -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1, +# but we'll use 5.0.2+git to indicate this version is compatible with 5.0.2 +PV = "5.0.2+git${SRCPV}" -PR = "${INC_PR}.1" +# drop when bumping SRCREV +PR = "r2" SRCREV = "5cb159395eccb1d96fb73a78e499eef30aacb46d" +SRC_URI += " \ + file://0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch \ +" + do_configure_prepend() { # Temporary hack to get qtwayland build for Qt 5.0.2 if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then From 3da4d425d06f74dbb0b5334f1f62efa20bd02176 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 14:42:03 +0200 Subject: [PATCH 202/347] qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION * drop INC_PR/PR where possible Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 2 -- recipes-qt/qt5/qt3d_git.bb | 11 ++++++++--- recipes-qt/qt5/qtjsondb.inc | 2 -- recipes-qt/qt5/qtjsondb_git.bb | 17 ++++++++++++++--- recipes-qt/qt5/qtlocation.inc | 2 -- recipes-qt/qt5/qtlocation_git.bb | 3 ++- recipes-qt/qt5/qtsystems.inc | 2 -- recipes-qt/qt5/qtsystems_git.bb | 3 ++- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 5ed2232e38..cfff5ee871 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ " -INC_PR = "r1" - FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/*/*/*.bez \ ${OE_QMAKE_PATH_QML}/*/*/*.obj \ diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 87d009e7fb..4a816c96df 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -4,8 +4,13 @@ require ${PN}.inc # last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" -PR = "${INC_PR}.0" - QT_MODULE_BRANCH = "master" -SRCREV = "0158ce783a61bac3e4f4ff619b0601daf9174ce6" +SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058" + +do_configure_prepend() { + # Temporary hack to get qt3d build for Qt 5.1.0 + if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then + echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf + fi +} diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc index 74009d9fd7..33816de3e1 100644 --- a/recipes-qt/qt5/qtjsondb.inc +++ b/recipes-qt/qt5/qtjsondb.inc @@ -8,5 +8,3 @@ LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130 file://${S}/examples/jsondb-client/example.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \ file://${S}/src/client/qjsondbglobal.h;endline=40;md5=34f5660524f0d70941d0416511ef49a0 \ " - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb index b9bb3e74e1..012bf9a3ea 100644 --- a/recipes-qt/qt5/qtjsondb_git.bb +++ b/recipes-qt/qt5/qtjsondb_git.bb @@ -4,8 +4,19 @@ require ${PN}.inc # qtjsondb wasn't released yet, last tag before this SRCREV isn't even 5.0.0-beta1, but lets use it for now PV = "4.999+5.0.0-beta1+git${SRCPV}" -PR = "${INC_PR}.0" - QT_MODULE_BRANCH = "master" -SRCREV = "c7c1e61bb5beddc3f4502548fd9ee498f1534e67" +SRCREV = "27a2b5d9a0f081f71c26a1716721411606f8dedf" + +do_configure_prepend() { + # Temporary hack to get qtjsondb build for Qt 5.1.0 + if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then + echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf + fi +} + +do_configure_append() { + # work around for this issue: + # http://www.mail-archive.com/ci-reports@qt-project.org/msg09692.html + sed -i '/^INCPATH/s#-I\.$#-I. -I../../include/QtJsonDbPartition#g' ${B}/src/client/Makefile +} diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc index e24516c4cc..348ca40eb8 100644 --- a/recipes-qt/qt5/qtlocation.inc +++ b/recipes-qt/qt5/qtlocation.inc @@ -2,5 +2,3 @@ require qt5.inc DEPENDS += "qtbase qt3d qtjsondb" # qtsystems qtmultimedia - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index c79604118e..ddf3bcb618 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -4,7 +4,8 @@ require ${PN}.inc # qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" -PR = "${INC_PR}.0" +# drop when bumping SRCREV +PR = "r1" QT_MODULE_BRANCH = "master" diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index af4eb41abf..f7672b1f6c 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc @@ -8,5 +8,3 @@ LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=4 file://${S}/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \ file://${S}/doc/src/systeminfo/systeminfo.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \ " - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index d73a9996dc..b1126f5122 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -4,7 +4,8 @@ require ${PN}.inc # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" -PR = "${INC_PR}.0" +# drop when bumping SRCREV +PR = "r1" QT_MODULE_BRANCH = "master" From 567a4d462fa0129751600d32d07ee67a9c0c3f23 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 16:20:29 +0200 Subject: [PATCH 203/347] qt5: drop INC_PR and update PR only in 5.0.2 recipes Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 2 -- recipes-qt/qt5/qtbase-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtbase.inc | 2 -- recipes-qt/qt5/qtbase_5.0.2.bb | 2 +- recipes-qt/qt5/qtdeclarative.inc | 2 -- recipes-qt/qt5/qtdeclarative_5.0.2.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects.inc | 2 -- recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb | 2 +- recipes-qt/qt5/qtimageformats.inc | 2 -- recipes-qt/qt5/qtimageformats_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend-native.inc | 2 -- recipes-qt/qt5/qtjsbackend-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend.inc | 2 -- recipes-qt/qt5/qtjsbackend_5.0.2.bb | 2 +- recipes-qt/qt5/qtmultimedia.inc | 2 -- recipes-qt/qt5/qtmultimedia_5.0.2.bb | 2 +- recipes-qt/qt5/qtquick1.inc | 2 -- recipes-qt/qt5/qtquick1_5.0.2.bb | 2 +- recipes-qt/qt5/qtscript.inc | 2 -- recipes-qt/qt5/qtscript_5.0.2.bb | 2 +- recipes-qt/qt5/qtsensors.inc | 2 -- recipes-qt/qt5/qtsvg.inc | 2 -- recipes-qt/qt5/qtsvg_5.0.2.bb | 2 +- recipes-qt/qt5/qtwebkit.inc | 2 -- recipes-qt/qt5/qtwebkit_5.0.2.bb | 2 +- recipes-qt/qt5/qtxmlpatterns.inc | 2 -- recipes-qt/qt5/qtxmlpatterns_5.0.2.bb | 2 +- 27 files changed, 13 insertions(+), 41 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 70a3072482..1adf422eb3 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -3,8 +3,6 @@ DEPENDS = "zlib-native dbus-native" SECTION = "libs" HOMEPAGE = "http://qt-project.org" -INC_PR = "r1" - QT_MODULE = "qtbase" require qt5-native.inc diff --git a/recipes-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb index 623b17ad33..b2bdcab0ee 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r3" SRC_URI += " \ file://0017-Rename-qAbs-Function-for-timeval.patch \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 0e091235be..c6cb2cce4d 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -120,8 +120,6 @@ QT_CONFIG_FLAGS += " \ ${EXTRA_OECONF} \ " -INC_PR = "r2" - # Qt uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 15ac3718ad..be7bcf53e0 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r3" SRC_URI += " \ file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 495e9a985f..6569c69e9d 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb index 439de99e8f..71f8ff550a 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI += " \ file://0001-qmltestexample-fix-link.patch \ diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index 1845faf16d..63e884eaa6 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtdeclarative" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb index 99db424f9e..ee5f3abe1d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ " -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "3d4475a4702f7bbe8064f69e17f1e8dd" SRC_URI[sha256sum] = "944399c5795b83b8f6b5e4ccec763ce5192f0e99b5e6d256f2b43a3165ee3016" diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc index 26e06d4dd8..bbb05a6557 100644 --- a/recipes-qt/qt5/qtimageformats.inc +++ b/recipes-qt/qt5/qtimageformats.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtimageformats_5.0.2.bb b/recipes-qt/qt5/qtimageformats_5.0.2.bb index 1b881650c0..e53c8633d7 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.2.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "e397a4237f51cfef7a3b38ad29b831d7" SRC_URI[sha256sum] = "93bd13a47002f188a8a83a5c742d396a2008a545fc22d58df442c4c070a463b7" diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 4369af0369..30663b875c 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -11,8 +11,6 @@ QT_MODULE = "qtjsbackend" require qt5-native.inc -INC_PR = "r0" - SRC_URI += "\ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb index 9dcbcc0112..83832d8604 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 4479654ed0..66afc948e9 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ DEPENDS += "qtbase qtjsbackend-native" -INC_PR = "r0" - SRC_URI += " \ file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ " diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb index b536da3257..b59a3ebb40 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI += " \ file://0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch \ diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index d9fdf793e9..6a1a7375c3 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtdeclarative gstreamer alsa-lib " - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.2.bb b/recipes-qt/qt5/qtmultimedia_5.0.2.bb index 7b97cbd3b6..17d9de0acc 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.2.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ " -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "f0902250974440c9c63569112a67440c" SRC_URI[sha256sum] = "fffc7bd71e6cb2853da3c90d7f9794583e7a83e4eeb6fea039a2efac53688834" diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index d39c0e6312..a9ec211cf7 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc @@ -2,5 +2,3 @@ require qt5.inc DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" # qttools - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtquick1_5.0.2.bb b/recipes-qt/qt5/qtquick1_5.0.2.bb index c20732e1ab..ddef81af79 100644 --- a/recipes-qt/qt5/qtquick1_5.0.2.bb +++ b/recipes-qt/qt5/qtquick1_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "22cd03e2e2aadbc5e2ce324a3526fa8b" SRC_URI[sha256sum] = "2a2235f4f4afd5bf8c6960efafbe89f8c443f174fb22931d48f566660cfcea9a" diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc index 26e06d4dd8..bbb05a6557 100644 --- a/recipes-qt/qt5/qtscript.inc +++ b/recipes-qt/qt5/qtscript.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtscript_5.0.2.bb b/recipes-qt/qt5/qtscript_5.0.2.bb index 0bac91ada3..9d334ce219 100644 --- a/recipes-qt/qt5/qtscript_5.0.2.bb +++ b/recipes-qt/qt5/qtscript_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "929db18c2f4f66cb2ba204076f9f0c22" SRC_URI[sha256sum] = "def1b60e5ff5513cbda27200554fb568ef822e0ee790476facfe3bcf3438598f" diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc index 786f603b14..b2147f1600 100644 --- a/recipes-qt/qt5/qtsensors.inc +++ b/recipes-qt/qt5/qtsensors.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtbase qtdeclarative" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc index 26e06d4dd8..bbb05a6557 100644 --- a/recipes-qt/qt5/qtsvg.inc +++ b/recipes-qt/qt5/qtsvg.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtsvg_5.0.2.bb b/recipes-qt/qt5/qtsvg_5.0.2.bb index 4ce9b81155..6f6706f74c 100644 --- a/recipes-qt/qt5/qtsvg_5.0.2.bb +++ b/recipes-qt/qt5/qtsvg_5.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ " -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "a000016afd3672540b2488c2f8e8d8b3" SRC_URI[sha256sum] = "5983485ade365a9e809d4614cc76fb106c35d5c514e0312a9013bb25227a6521" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 9c467dce08..4c9cc7fe0f 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -11,8 +11,6 @@ DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3" QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" -INC_PR = "r0" - do_configure_append() { # Fix rpaths for QtWebProcess find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb index 4d2f34d957..ab1cacd5c1 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.2.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.2.bb @@ -1,7 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "85aad9f287910c21c8464d7d1ea010a9" SRC_URI[sha256sum] = "6ff4038f8db68be51661d1a6646f510b26f6ebbecbdeefb76cd8361f808768f6" diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc index 26e06d4dd8..bbb05a6557 100644 --- a/recipes-qt/qt5/qtxmlpatterns.inc +++ b/recipes-qt/qt5/qtxmlpatterns.inc @@ -1,5 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -INC_PR = "r0" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb index a10c83508a..47cdb32000 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " -PR = "${INC_PR}.0" +PR = "r1" SRC_URI[md5sum] = "29e6776165e43e9f3a865338121b4e1d" SRC_URI[sha256sum] = "c05ae43fffc911ffda808deecebddd1b31916714cefc9cfd840689fc52ae20a6" From 2649027bd09473f2cbe7048fc75712fe448e2f29 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 22 Jul 2013 14:49:14 +0200 Subject: [PATCH 204/347] qtimageformats: add dependency on tiff * it's autodetected from sysroot Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc index bbb05a6557..1b4bb4ff52 100644 --- a/recipes-qt/qt5/qtimageformats.inc +++ b/recipes-qt/qt5/qtimageformats.inc @@ -1,3 +1,3 @@ require qt5.inc -DEPENDS += "qtbase" +DEPENDS += "qtbase tiff" From a4c346ba8f66cf06e92b3624d9487bccc19c1358 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 22 Jul 2013 15:15:53 +0200 Subject: [PATCH 205/347] qtwebkit: add dependency on gstreamer and libxslt * it's autodetected from sysroot, make it deterministic * maybe I should allow to change gst-0.10 to 1.0 without rewriting DEPENDS Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 4c9cc7fe0f..14a4e7a177 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3" +DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt" # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" From 43872948d4bb764c723d122cac8dcc0cb1ed93c6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 22 Jul 2013 14:55:26 +0200 Subject: [PATCH 206/347] qtmultimedia: add gst-plugins-base dependency and openal PACKAGECONFIG * this will need small patch in qtmultimedia.pro to run qtCompileTest(openal) only with OE_OPENAL_ENABLED Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 6a1a7375c3..87269850ab 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,3 +1,13 @@ require qt5.inc -DEPENDS += "qtdeclarative gstreamer alsa-lib " +DEPENDS += "qtdeclarative gstreamer gst-plugins-base alsa-lib " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[openal] = ",,openal-soft" + +do_configure_prepend() { + # disable openal test if it isn't enabled by PACKAGECONFIG + sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro +} + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" From 07301a163688682b5b3e5dddada6da63593917b0 Mon Sep 17 00:00:00 2001 From: Christian Gagneraud Date: Wed, 24 Jul 2013 21:31:47 +0000 Subject: [PATCH 207/347] qtbase.inc: Fix qtbase-tools runtime depencency on perl * While building a custom rootfs using poky, meta-oe, meta-ti and meta-qt5 (all on Dylan branch), I got the following error: [...] Computing transaction...error: Can't install qtbase-tools-5.0.2-r2.0@armv7a_vfp_neon: no package provides /usr/bin/perl [...] * syncqt is perl script with /usr/bin/perl shebang, that's why rpm was complaining (other package managers in OE doesn't check that) Signed-off-by: Christian Gagneraud Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index c6cb2cce4d..5c1b51b6b5 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -25,6 +25,9 @@ SRC_URI += " \ DEPENDS += "qtbase-native" +# for syncqt +RDEPENDS_${PN}-tools += "perl" + # separate some parts of PACKAGECONFIG which are often changed # be aware that you need to add icu to build qtwebkit, default # PACKAGECONFIG is kept rather minimal for people who don't need From bb4c8adeeb3107074fbf63bddf292059b370afa5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 25 Jul 2013 17:45:16 +0200 Subject: [PATCH 208/347] qtwayland: demote 5.1.0+git version a bit * 5.0.2+git should stay default for people without qt5-versions.inc * make sure that % isn't appended twice in qt5-versions.inc Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 6 +++++- recipes-qt/qt5/qtwayland_5.1.0+git.bb | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index b946a6a62d..35dd211af2 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -17,4 +17,8 @@ PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" -PREFERRED_VERSION_qtwayland = "${QT5_VERSION}%" + +# append % only if it isn't included already +# 5.1.0+git%% won't work and it's exactly where we need to overcome DEFAULT_PREFERENCE with PREFERRED_VERSION +QT5_VERSION_WAYLAND = "${@base_contains('QT5_VERSION', '5.1.0+git%', '${QT5_VERSION}', '${QT5_VERSION}%', d)}" +PREFERRED_VERSION_qtwayland = "${QT5_VERSION_WAYLAND}" diff --git a/recipes-qt/qt5/qtwayland_5.1.0+git.bb b/recipes-qt/qt5/qtwayland_5.1.0+git.bb index aaa439cf80..31ed85c349 100644 --- a/recipes-qt/qt5/qtwayland_5.1.0+git.bb +++ b/recipes-qt/qt5/qtwayland_5.1.0+git.bb @@ -5,6 +5,9 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-5.1.0+git:" DEPENDS += "qtwayland-native" +# qtwayland_git has -1 and should be default +DEFAULT_PREFERRENCE = "-2" + # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # this PV is only to indicate that this recipe is compatible with qt5 5.1.0 # while qtwayland_git stays compatible with 5.0.2 From b0100c1b5704e0216733a35ff42afab3c350bef4 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:14:57 +0000 Subject: [PATCH 209/347] classes: qmake5: move QT_DIR_NAME to qmake5_paths * qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which doesn't makes sense and breaks some use cases Signed-off-by: Simon Busch --- classes/qmake5_base.bbclass | 1 - classes/qmake5_paths.bbclass | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 04518ef418..2db0fa32a9 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -46,7 +46,6 @@ OE_QMAKE_LDFLAGS = "${LDFLAGS}" OE_QMAKE_AR = "${AR}" OE_QMAKE_STRIP = "echo" OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" -QT_DIR_NAME ?= "qt5" # this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${WORKDIR}/qt.conf" diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 8f1857f058..2b5bf4b663 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -2,6 +2,8 @@ # about conflicts with qt4, then you can add qmake5_paths.bbclass # to your distro layer and flatten all QT_DIR_NAME directories +QT_DIR_NAME ?= "qt5" + OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}" OE_QMAKE_PATH_LIBS = "${libdir}" From 243e05f1de42d372abfecab721f8c40eee08548e Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:11:56 +0000 Subject: [PATCH 210/347] qtbase: fix cmake files to use our host binaries * only for qt 5.1.0; didn't had the time to port this to 5.0.2 * client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 +++++++++++++++++++ ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 +++++++++++++++++++ ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 +++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 4 files changed, 142 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch create mode 100644 recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 0000000000..107ba30bac --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 27465c65419c1b5bdc8ed50e56428ff5fd64f62b Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 4e0fcda..2bbb54c 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + # For CMake automoc feature +@@ -32,7 +32,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 0000000000..00fa5aeae4 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 26ea6bec700ebe345113558c334389cb408780c4 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index a804278..a1f8492 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}/$${CMAKE_BIN_DIR}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}/$${CMAKE_BIN_DIR}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}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 0000000000..aa51e2f89b --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 03ff55ff67ef7ab929d9b323484da382f6318df2 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index e01b448..2f6b8ea 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}/$${CMAKE_BIN_DIR}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}/$${CMAKE_BIN_DIR}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}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5c1b51b6b5..21386dcbaa 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -21,6 +21,7 @@ SRC_URI += " \ file://0021-configure-make-pulseaudio-a-configurable-option.patch \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ + file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ " DEPENDS += "qtbase-native" From 6b39eda7a60597a25b9dbed823fe7f2fa8db5659 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:20:58 +0000 Subject: [PATCH 211/347] classes: add new cmake_qt5 class A cmake specific qt5 class which sets all required configuration parameters to successfully compile cmake based applications. Signed-off-by: Simon Busch --- classes/cmake_qt5.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 classes/cmake_qt5.bbclass diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass new file mode 100644 index 0000000000..84b6d6318e --- /dev/null +++ b/classes/cmake_qt5.bbclass @@ -0,0 +1,6 @@ +inherit cmake +inherit qmake5_paths + +EXTRA_OECMAKE += " \ + -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ +" From 4450a42aba024e8af7632074011da074479aac71 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Fri, 26 Jul 2013 08:19:55 +0000 Subject: [PATCH 212/347] qtbase: fix cmake patches to point to correct host binary directory Signed-off-by: Simon Busch --- ...e-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 6 +++--- ...e-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 6 +++--- ...e-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 107ba30bac..275f53e66f 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -20,7 +20,7 @@ index 4e0fcda..2bbb54c 100644 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" !!ELSE - IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\" !!ENDIF ) endif() @@ -29,7 +29,7 @@ index 4e0fcda..2bbb54c 100644 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" !!ELSE - IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\" !!ENDIF ) # For CMake automoc feature @@ -38,7 +38,7 @@ index 4e0fcda..2bbb54c 100644 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" !!ELSE - IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\" !!ENDIF ) endif() diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 00fa5aeae4..2b9378491a 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -20,7 +20,7 @@ index a804278..a1f8492 100644 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}/$${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}) @@ -29,7 +29,7 @@ index a804278..a1f8492 100644 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}/$${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}) @@ -38,7 +38,7 @@ index a804278..a1f8492 100644 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}/$${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/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index aa51e2f89b..061ed656c8 100644 --- a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -20,7 +20,7 @@ index e01b448..2f6b8ea 100644 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}/$${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}) @@ -29,7 +29,7 @@ index e01b448..2f6b8ea 100644 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}/$${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}) @@ -38,7 +38,7 @@ index e01b448..2f6b8ea 100644 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}/$${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}) From ee6c2abf6a6679582e28f72301f1a538ef98bf95 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Fri, 2 Aug 2013 09:06:06 +0000 Subject: [PATCH 213/347] classes: cmake_qt5: export all qt5 related paths to cmake Signed-off-by: Simon Busch --- classes/cmake_qt5.bbclass | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 84b6d6318e..94a60dcf1d 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -2,5 +2,32 @@ inherit cmake inherit qmake5_paths EXTRA_OECMAKE += " \ + -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ + -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ + -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ + -DOE_QMAKE_PATH_ARCHDATA=${OE_QMAKE_PATH_ARCHDATA} \ + -DOE_QMAKE_PATH_DATA=${OE_QMAKE_PATH_DATA} \ + -DOE_QMAKE_PATH_BINS=${OE_QMAKE_PATH_BINS} \ + -DOE_QMAKE_PATH_LIBEXECS=${OE_QMAKE_PATH_LIBEXECS} \ + -DOE_QMAKE_PATH_PLUGINS=${OE_QMAKE_PATH_PLUGINS} \ + -DOE_QMAKE_PATH_IMPORTS=${OE_QMAKE_PATH_IMPORTS} \ + -DOE_QMAKE_PATH_QML=${OE_QMAKE_PATH_QML} \ + -DOE_QMAKE_PATH_TRANSLATIONS=${OE_QMAKE_PATH_TRANSLATIONS} \ + -DOE_QMAKE_PATH_DOCS=${OE_QMAKE_PATH_DOCS} \ + -DOE_QMAKE_PATH_SETTINGS=${OE_QMAKE_PATH_SETTINGS} \ + -DOE_QMAKE_PATH_EXAMPLES=${OE_QMAKE_PATH_EXAMPLES} \ + -DOE_QMAKE_PATH_TESTS=${OE_QMAKE_PATH_TESTS} \ + -DOE_QMAKE_PATH_HOST_PREFIX=${OE_QMAKE_PATH_HOST_PREFIX} \ + -DOE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS} \ + -DOE_QMAKE_PATH_HOST_DATA=${OE_QMAKE_PATH_HOST_DATA} \ + -DOE_QMAKE_PATH_HOST_LIBS=${OE_QMAKE_PATH_HOST_LIBS} \ -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ -" + -DOE_QMAKE_PATH_QT_HEADERS=${OE_QMAKE_PATH_QT_HEADERS} \ + -DOE_QMAKE_PATH_QT_ARCHDATA=${OE_QMAKE_PATH_QT_ARCHDATA} \ + -DOE_QMAKE_PATH_QT_DATA=${OE_QMAKE_PATH_QT_DATA} \ + -DOE_QMAKE_PATH_QT_BINS=${OE_QMAKE_PATH_QT_BINS} \ + -DOE_QMAKE_PATH_QT_TRANSLATIONS=${OE_QMAKE_PATH_QT_TRANSLATIONS} \ + -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \ + -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \ + -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \ + -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}" From d68d26ba4e539929f3949943fa6e4d5c5340afeb Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 10 Aug 2013 09:17:13 +0000 Subject: [PATCH 214/347] qtwayland: build and package examples applications too Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 3ae98edebe..40dd803ad6 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -21,6 +21,8 @@ SRC_URI += " \ QT_WAYLAND_CONFIG ?= "wayland-compositor" QT_WAYLAND_DEFINES ?= "" +QT_WAYLAND_BUILD_PARTS ?= "examples" EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}" EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}" +EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=${QT_WAYLAND_BUILD_PARTS}" From 5b19e4bd6f48cb67438306ac7bc34a524e8bec19 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Sat, 3 Aug 2013 10:38:47 +0000 Subject: [PATCH 215/347] qtserialport: Add module Signed-off-by: Laszlo Papp Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtserialport.inc | 3 +++ recipes-qt/qt5/qtserialport_5.1.0.bb | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 recipes-qt/qt5/qtserialport.inc create mode 100644 recipes-qt/qt5/qtserialport_5.1.0.bb diff --git a/recipes-qt/qt5/qtserialport.inc b/recipes-qt/qt5/qtserialport.inc new file mode 100644 index 0000000000..bbb05a6557 --- /dev/null +++ b/recipes-qt/qt5/qtserialport.inc @@ -0,0 +1,3 @@ +require qt5.inc + +DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtserialport_5.1.0.bb b/recipes-qt/qt5/qtserialport_5.1.0.bb new file mode 100644 index 0000000000..9b6f7da2d6 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "1f70621ae40cbda948106b070c6c37d2" +SRC_URI[sha256sum] = "0f36803c480b2b7111b343e9dd871ffab1b4fd53147bd564125ef2994b09cfb9" From 0f7b2334268b99d3a4ea43bde735b4566f905044 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 3 Aug 2013 15:23:43 +0200 Subject: [PATCH 216/347] qt5-versions: Change default version to 5.1.0 Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 35dd211af2..432da9f7f9 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file # possible values now "5.0.2", "5.1.0", "5.1.0+git%" -QT5_VERSION ?= "5.0.2" +QT5_VERSION ?= "5.1.0" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" From 886e8ee5bdb4c95f2e6c1c203f76bc176329454b Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 3 Aug 2013 08:46:10 +0000 Subject: [PATCH 217/347] qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...ix-data-corruption-in-readData-metho.patch | 41 +++++++++++++++++++ ...ix-data-corruption-in-readData-metho.patch | 41 +++++++++++++++++++ ...ix-data-corruption-in-readData-metho.patch | 41 +++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 4 files changed, 124 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch create mode 100644 recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch new file mode 100644 index 0000000000..33e77eaca8 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch @@ -0,0 +1,41 @@ +From af96c6fed931564c95037539f07e9c8e33c69529 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: Backport [https://codereview.qt-project.org/#change,61698] +Signed-off-by: Jonathan Liu + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu +Reviewed-by: Shane Kearns +--- + src/network/access/qhttpmultipart.cpp | 3 +- + .../access/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 4397ef8..5985ed9 100644 +--- a/src/network/access/qhttpmultipart.cpp ++++ b/src/network/access/qhttpmultipart.cpp +@@ -497,7 +497,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-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch new file mode 100644 index 0000000000..6858cead49 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch @@ -0,0 +1,41 @@ +From af96c6fed931564c95037539f07e9c8e33c69529 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,61698] +Signed-off-by: Jonathan Liu + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu +Reviewed-by: Shane Kearns +--- + src/network/access/qhttpmultipart.cpp | 3 +- + .../access/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 4397ef8..5985ed9 100644 +--- a/src/network/access/qhttpmultipart.cpp ++++ b/src/network/access/qhttpmultipart.cpp +@@ -497,7 +497,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-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch new file mode 100644 index 0000000000..6858cead49 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch @@ -0,0 +1,41 @@ +From af96c6fed931564c95037539f07e9c8e33c69529 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,61698] +Signed-off-by: Jonathan Liu + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu +Reviewed-by: Shane Kearns +--- + src/network/access/qhttpmultipart.cpp | 3 +- + .../access/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 4397ef8..5985ed9 100644 +--- a/src/network/access/qhttpmultipart.cpp ++++ b/src/network/access/qhttpmultipart.cpp +@@ -497,7 +497,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-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 21386dcbaa..47038d0aa3 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -22,6 +22,7 @@ SRC_URI += " \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ + file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ " DEPENDS += "qtbase-native" From 3529eb8055a25811b522348643d41a39104089d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bot=C3=B6?= Date: Tue, 13 Aug 2013 06:47:07 +0000 Subject: [PATCH 218/347] qt5-5.0.2.inc: update path to sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They moved the 5.0.2 sources into an archive dir upstream, this updates the SRC_URI accordingly. Signed-off-by: Erik Botö Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.0.2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index e2a56e5c54..0bf1404369 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -7,7 +7,7 @@ QT_VERSION ?= "${PV}" QT_VERSION_DIR ?= "${QT_VERSION}" SRC_URI += " \ - http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + http://releases.qt-project.org/archive/qt/5.0/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ " S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" From 54d1f81e8410c69b659be8608a9b3273554492e9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 15 Aug 2013 12:26:49 +0200 Subject: [PATCH 219/347] Revert "qtserialport: Add module" * incorrect LIC_FILES_CHKSUMS This reverts commit 5b19e4bd6f48cb67438306ac7bc34a524e8bec19. --- recipes-qt/qt5/qtserialport.inc | 3 --- recipes-qt/qt5/qtserialport_5.1.0.bb | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 recipes-qt/qt5/qtserialport.inc delete mode 100644 recipes-qt/qt5/qtserialport_5.1.0.bb diff --git a/recipes-qt/qt5/qtserialport.inc b/recipes-qt/qt5/qtserialport.inc deleted file mode 100644 index bbb05a6557..0000000000 --- a/recipes-qt/qt5/qtserialport.inc +++ /dev/null @@ -1,3 +0,0 @@ -require qt5.inc - -DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtserialport_5.1.0.bb b/recipes-qt/qt5/qtserialport_5.1.0.bb deleted file mode 100644 index 9b6f7da2d6..0000000000 --- a/recipes-qt/qt5/qtserialport_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1f70621ae40cbda948106b070c6c37d2" -SRC_URI[sha256sum] = "0f36803c480b2b7111b343e9dd871ffab1b4fd53147bd564125ef2994b09cfb9" From c3632023e11deb9e7a862f67ad631576e73a3add Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 13 Aug 2013 22:57:10 +0200 Subject: [PATCH 220/347] qtbase: be more specific in opengl switch with gl in PACKAGECONFIG * full GL is called desktop in qtbase configure * without this it will try to autodetect and doesn't fail when e.g. mesa wasn't built before qtbase Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 47038d0aa3..e8b240670b 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -72,7 +72,8 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" -PACKAGECONFIG[gl] = "-opengl -no-eglfs,,virtual/libgl" +# gl or gles2 is needed in order to build qtdeclarative (qtdeclarative.do_configure fails to find quick module without) +PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" @@ -100,6 +101,7 @@ PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" +# depends on glib PACKAGECONFIG[gstreamer] = "-gstreamer,-no-gstreamer,gstreamer" PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" @@ -107,6 +109,7 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb,linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,kms" +# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl" From 2d61422b837acd382e52f78f7ff357b8aca9c3db Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Thu, 15 Aug 2013 19:18:36 +0000 Subject: [PATCH 221/347] Fix download url for qt5-5.0.2. Signed-off-by: Marek Belisko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.0.2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index 0bf1404369..c04b3a2aa4 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -7,7 +7,7 @@ QT_VERSION ?= "${PV}" QT_VERSION_DIR ?= "${QT_VERSION}" SRC_URI += " \ - http://releases.qt-project.org/archive/qt/5.0/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + http://download.qt-project.org/archive/qt/5.0/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ " S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" From 84c2a25417d9ddc0814f2ac34b6568051e54938e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 19 Aug 2013 08:31:10 +0200 Subject: [PATCH 222/347] qt5-5.1.0: Drop negative D_P Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-5.1.0.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-qt/qt5/qt5-5.1.0.inc b/recipes-qt/qt5/qt5-5.1.0.inc index e26cc05344..0de6539da9 100644 --- a/recipes-qt/qt5/qt5-5.1.0.inc +++ b/recipes-qt/qt5/qt5-5.1.0.inc @@ -6,9 +6,6 @@ QT_VERSION ?= "${PV}" # it's different for RC versions QT_VERSION_DIR ?= "5.1" -# less tested then 5.0.2 or git recipes -DEFAULT_PREFERENCE = "-2" - SRC_URI += " \ http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ " From 7c3a1a208df46fcf094b957cdd35f06729c53eda Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Thu, 22 Aug 2013 01:27:16 +0200 Subject: [PATCH 223/347] qtbase: upgrade patches for proper cmake support of native binaries at build time Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 51 ++++++++++++++++--- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 51 ++++++++++++++++--- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 51 ++++++++++++++++--- 3 files changed, 132 insertions(+), 21 deletions(-) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 275f53e66f..9419b81b78 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -1,18 +1,20 @@ -From 27465c65419c1b5bdc8ed50e56428ff5fd64f62b Mon Sep 17 00:00:00 2001 +From 0e6b7bcb1c02750368722d1770b0098ce9b28327 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path - to host binaries +Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to + host binaries Upstream-Status: Inappropiate (configuration) Signed-off-by: Simon Busch --- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 4e0fcda..2bbb54c 100644 +index 4e0fcda..925a335 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) @@ -42,6 +44,41 @@ index 4e0fcda..2bbb54c 100644 !!ENDIF ) endif() +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 8ecf7ce..af86a88 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index d9abb45..ca17862 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::uic) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() -- -1.8.3.2 +1.8.1.2 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 2b9378491a..7ca5e80886 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -1,18 +1,20 @@ -From 26ea6bec700ebe345113558c334389cb408780c4 Mon Sep 17 00:00:00 2001 +From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path - to host binaries +Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to + host binaries Upstream-Status: Inappropiate (configuration) Signed-off-by: Simon Busch --- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a804278..a1f8492 100644 +index a804278..b6fbbea 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -42,6 +44,41 @@ index a804278..a1f8492 100644 !!ENDIF _qt5_Core_check_file_exists(${imported_location}) +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d94715..3209e42 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 e5650ff..7fb8b21 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}) + -- -1.8.3.2 +1.8.1.2 diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 061ed656c8..7ca5e80886 100644 --- a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -1,18 +1,20 @@ -From 03ff55ff67ef7ab929d9b323484da382f6318df2 Mon Sep 17 00:00:00 2001 +From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path - to host binaries +Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to + host binaries Upstream-Status: Inappropiate (configuration) Signed-off-by: Simon Busch --- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e01b448..2f6b8ea 100644 +index a804278..b6fbbea 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -42,6 +44,41 @@ index e01b448..2f6b8ea 100644 !!ENDIF _qt5_Core_check_file_exists(${imported_location}) +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d94715..3209e42 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 e5650ff..7fb8b21 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}) + -- -1.8.3.2 +1.8.1.2 From 2868f1a1838ab6a893fd01a05e61d582640a056d Mon Sep 17 00:00:00 2001 From: Abhijit Potnis Date: Tue, 20 Aug 2013 18:19:14 +0530 Subject: [PATCH 224/347] qtwebkit-examples: Add module Signed-off-by: Abhijit Potnis Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 1 + recipes-qt/qt5/qtwebkit-examples.inc | 7 +++++++ recipes-qt/qt5/qtwebkit-examples_5.0.2.bb | 8 ++++++++ recipes-qt/qt5/qtwebkit-examples_5.1.0.bb | 5 +++++ recipes-qt/qt5/qtwebkit-examples_git.bb | 4 ++++ 5 files changed, 25 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit-examples.inc create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.0.2.bb create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.1.0.bb create mode 100644 recipes-qt/qt5/qtwebkit-examples_git.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 432da9f7f9..b9959ac4c7 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -16,6 +16,7 @@ PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" +PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" # append % only if it isn't included already diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc new file mode 100644 index 0000000000..e8fa3e72c1 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples.inc @@ -0,0 +1,7 @@ +require qt5.inc + +LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=112;md5=6f92d041824c63426993c8ce3ae0eb77 \ + file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=223;md5=13ffb472fefe4bdf6464954a22251f35" + +DEPENDS += "qtwebkit" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb b/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb new file mode 100644 index 0000000000..42a2264bf0 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb @@ -0,0 +1,8 @@ +require qt5-${PV}.inc +require ${PN}.inc + +# was renamed to just qtwebkit-examples in 5.1 +QT_MODULE = "qtwebkit-examples-and-demos" + +SRC_URI[md5sum] = "9c48df80ba9bb3587b4d6ec35daf840a" +SRC_URI[sha256sum] = "10981ae3a6775387badce33542733d63895c5a62b3b33e0973d782ec1b9174e6" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb new file mode 100644 index 0000000000..1e671b6b55 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "a27360f16e4ca31e3d1098d1b2feba73" +SRC_URI[sha256sum] = "f8078a87df729103e6009432e5b784531842997197827f67db8a34f1715f8921" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb new file mode 100644 index 0000000000..67c2091d89 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "08118e862731b5ce91368d326a04b4a565e7f483" From 284020d9344b6fbd88d9c6d5ff6fbaef430a775b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Aug 2013 19:03:59 +0200 Subject: [PATCH 225/347] qtwebkit: remove examples packages * fixes: NOTE: multiple providers are available for runtime qtwebkit-examples (qtwebkit-examples, qtwebkit) NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples NOTE: multiple providers are available for runtime qtwebkit-examples-dev (qtwebkit, qtwebkit-examples) NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples-dev Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 14a4e7a177..75492d58aa 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -11,6 +11,9 @@ DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" +# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " + do_configure_append() { # Fix rpaths for QtWebProcess find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" From 2340ce8714f2a50e459c80a6aab51dad37378303 Mon Sep 17 00:00:00 2001 From: Bhooshan Supe Date: Fri, 26 Jul 2013 19:59:09 -0700 Subject: [PATCH 226/347] qttools-native: Add module to build lrelease+lupdate+lconvert :Release Notes: Add optional Qt-Tools module. :Detailed Notes: Qt provide optional Qt-Tools like "lrelease", etc. In absence of these tools one can not have i18n and l10n changes automated in build. Adding "qttools-native" to "meta-qt5" Open Embedded layer provides those tools. Using Qt-Tools i18n and l10n changes can be auomated. :Testing Performed: :QA Notes: :Issues Addressed: [GF-11028] Enable build of Qt localization tools in the Qt component Change-Id: Ieb679249a05501a6ccb25108903a0fd48d4014f0 --- classes/qmake5.bbclass | 9 -- conf/distro/include/qt5-versions.inc | 1 + ...build-only-lrelease-lupdate-lconvert.patch | 127 ++++++++++++++++ ...build-only-lrelease-lupdate-lconvert.patch | 136 +++++++++++++++++ ...build-only-lrelease-lupdate-lconvert.patch | 138 ++++++++++++++++++ recipes-qt/qt5/qttools-native.inc | 22 +++ recipes-qt/qt5/qttools-native_5.0.2.bb | 5 + recipes-qt/qt5/qttools-native_5.1.0.bb | 10 ++ recipes-qt/qt5/qttools-native_git.bb | 4 + 9 files changed, 443 insertions(+), 9 deletions(-) create mode 100644 recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch create mode 100644 recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch create mode 100644 recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch create mode 100644 recipes-qt/qt5/qttools-native.inc create mode 100644 recipes-qt/qt5/qttools-native_5.0.2.bb create mode 100644 recipes-qt/qt5/qttools-native_5.1.0.bb create mode 100644 recipes-qt/qt5/qttools-native_git.bb diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index e1dda0d687..b056ea755d 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,15 +6,6 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native" DEPENDS_prepend = "${QT5TOOLSDEPENDS} " -# do we still need to export these? -#OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" -#OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" -#OE_QMAKE_LIBS_QT = "qt" -#OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" -#OE_QMAKE_LIBS_X11SM = "-lSM -lICE" -#OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" -#OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" - do_configure() { qmake5_base_do_configure } diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index b9959ac4c7..ea159700cd 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -15,6 +15,7 @@ PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" +PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch new file mode 100644 index 0000000000..c5abceee03 --- /dev/null +++ b/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -0,0 +1,127 @@ +From f5d7b5cd073eb6b5a60658b9622c59a682fd828d Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 11 Sep 2013 18:30:08 +0200 +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert + +This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native +is built without GUI support (no-png is set) and we still want to build +native lrelease + lupdate + lconvert tools. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + examples/examples.pro | 4 ++-- + src/designer/src/src.pro | 14 ++++++++------ + src/linguist/linguist.pro | 2 +- + src/src.pro | 10 ++++++---- + tests/auto/auto.pro | 20 +++++++++++--------- + 5 files changed, 28 insertions(+), 22 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 4955969..8e86419 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant +- ++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant ++qtHaveModule(widgets): SUBDIRS += linguist uitools +diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro +index 64d1c37..6e6912d 100644 +--- a/src/designer/src/src.pro ++++ b/src/designer/src/src.pro +@@ -1,10 +1,12 @@ + TEMPLATE = subdirs + CONFIG += ordered + +-SUBDIRS = \ +- uitools \ +- lib \ +- components \ +- designer ++!linguistonly { ++ SUBDIRS = \ ++ lib \ ++ components \ ++ designer ++} ++SUBDIRS += uitools + +-contains(QT_CONFIG, shared): SUBDIRS += plugins ++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index 04b0ab6..8c63bb4 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -3,7 +3,7 @@ SUBDIRS = \ + lrelease \ + lupdate \ + lconvert +-!no-png:qtHaveModule(widgets): SUBDIRS += linguist ++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist + + win32:CMAKE_BIN_SUFFIX = ".exe" + +diff --git a/src/src.pro b/src/src.pro +index 3799567..7deb785 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -5,10 +5,12 @@ qtHaveModule(widgets) { + no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { +- SUBDIRS = assistant \ ++ !linguistonly { ++ SUBDIRS = assistant \ + pixeltool \ +- qtestlib \ +- designer ++ qtestlib ++ } ++ SUBDIRS += designer + # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig + } + } +@@ -21,7 +23,7 @@ mac { + + embedded:SUBDIRS += kmap2qmap + +-qtHaveModule(dbus): SUBDIRS += qdbus ++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus + # We don't need these command line utilities on embedded platforms. + embedded: SUBDIRS += makeqpf + +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index 074aa34..d38e05d 100644 +--- a/tests/auto/auto.pro ++++ b/tests/auto/auto.pro +@@ -1,13 +1,15 @@ + TEMPLATE=subdirs +-SUBDIRS=\ +- linguist \ +- host.pro \ +- qhelpcontentmodel \ +- qhelpenginecore \ +- qhelpgenerator \ +- qhelpindexmodel \ +- qhelpprojectdata \ +- cmake ++!linguistonly { ++ SUBDIRS=\ ++ linguist \ ++ host.pro \ ++ qhelpcontentmodel \ ++ qhelpenginecore \ ++ qhelpgenerator \ ++ qhelpindexmodel \ ++ qhelpprojectdata \ ++ cmake ++} + + # These tests don't make sense for cross-compiled builds + cross_compile:SUBDIRS -= host.pro +-- +1.7.10.4 + diff --git a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch new file mode 100644 index 0000000000..f1b8783507 --- /dev/null +++ b/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -0,0 +1,136 @@ +From 4df58d96ea516358d2762a219c0b196e56c8e89b Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 11 Sep 2013 18:30:08 +0200 +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert + +This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native +is built without GUI support (no-png is set) and we still want to build +native lrelease + lupdate + lconvert tools. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + examples/examples.pro | 4 ++-- + src/designer/src/src.pro | 16 +++++++++------- + src/linguist/linguist.pro | 2 +- + src/src.pro | 10 ++++++---- + tests/auto/auto.pro | 20 +++++++++++--------- + 5 files changed, 29 insertions(+), 23 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 4955969..8e86419 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant +- ++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant ++qtHaveModule(widgets): SUBDIRS += linguist uitools +diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro +index e02ca8e..49527c5 100644 +--- a/src/designer/src/src.pro ++++ b/src/designer/src/src.pro +@@ -1,18 +1,20 @@ + TEMPLATE = subdirs + +-SUBDIRS = \ +- uitools \ +- lib \ +- components \ +- designer ++!linguistonly { ++ SUBDIRS = \ ++ lib \ ++ components \ ++ designer ++} ++SUBDIRS += uitools + +-contains(QT_CONFIG, shared): SUBDIRS += plugins ++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins + + components.depends = lib + designer.depends = components + plugins.depends = lib + +-qtNomakeTools( \ ++!linguistonly:qtNomakeTools( \ + lib \ + components \ + designer \ +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index df3c0c7..75bdf26 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -3,7 +3,7 @@ SUBDIRS = \ + lrelease \ + lupdate \ + lconvert +-!no-png:qtHaveModule(widgets): SUBDIRS += linguist ++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist + + qtNomakeTools( \ + linguist \ +diff --git a/src/src.pro b/src/src.pro +index c8756db..d71c4a0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -4,10 +4,12 @@ qtHaveModule(widgets) { + no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { +- SUBDIRS = assistant \ ++ !linguistonly { ++ SUBDIRS = assistant \ + pixeltool \ +- qtestlib \ +- designer ++ qtestlib ++ } ++ SUBDIRS += designer + # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig + + linguist.depends = designer +@@ -20,7 +22,7 @@ mac { + SUBDIRS += macdeployqt + } + +-qtHaveModule(dbus): SUBDIRS += qdbus ++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus + + qtNomakeTools( \ + pixeltool \ +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index 074aa34..a744d46 100644 +--- a/tests/auto/auto.pro ++++ b/tests/auto/auto.pro +@@ -1,13 +1,15 @@ + TEMPLATE=subdirs +-SUBDIRS=\ +- linguist \ +- host.pro \ +- qhelpcontentmodel \ +- qhelpenginecore \ +- qhelpgenerator \ +- qhelpindexmodel \ +- qhelpprojectdata \ +- cmake ++!linguistonly { ++ SUBDIRS=\ ++ linguist \ ++ host.pro \ ++ qhelpcontentmodel \ ++ qhelpenginecore \ ++ qhelpgenerator \ ++ qhelpindexmodel \ ++ qhelpprojectdata \ ++ cmake ++} + + # These tests don't make sense for cross-compiled builds + cross_compile:SUBDIRS -= host.pro +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch new file mode 100644 index 0000000000..b1145be14a --- /dev/null +++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -0,0 +1,138 @@ +From 3a1d11f3391d7745a01a68629d04f8b5b3c40ffb Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 11 Sep 2013 18:30:08 +0200 +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert + +This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native +is built without GUI support (no-png is set) and we still want to build +native lrelease + lupdate + lconvert tools. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + examples/examples.pro | 4 ++-- + src/designer/src/src.pro | 16 +++++++++------- + src/linguist/linguist.pro | 2 +- + src/src.pro | 10 ++++++---- + tests/auto/auto.pro | 22 ++++++++++++---------- + 5 files changed, 30 insertions(+), 24 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 4955969..8e86419 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant +- ++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant ++qtHaveModule(widgets): SUBDIRS += linguist uitools +diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro +index e02ca8e..49527c5 100644 +--- a/src/designer/src/src.pro ++++ b/src/designer/src/src.pro +@@ -1,18 +1,20 @@ + TEMPLATE = subdirs + +-SUBDIRS = \ +- uitools \ +- lib \ +- components \ +- designer ++!linguistonly { ++ SUBDIRS = \ ++ lib \ ++ components \ ++ designer ++} ++SUBDIRS += uitools + +-contains(QT_CONFIG, shared): SUBDIRS += plugins ++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins + + components.depends = lib + designer.depends = components + plugins.depends = lib + +-qtNomakeTools( \ ++!linguistonly:qtNomakeTools( \ + lib \ + components \ + designer \ +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index df3c0c7..75bdf26 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -3,7 +3,7 @@ SUBDIRS = \ + lrelease \ + lupdate \ + lconvert +-!no-png:qtHaveModule(widgets): SUBDIRS += linguist ++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist + + qtNomakeTools( \ + linguist \ +diff --git a/src/src.pro b/src/src.pro +index c8756db..d71c4a0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -4,10 +4,12 @@ qtHaveModule(widgets) { + no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { +- SUBDIRS = assistant \ ++ !linguistonly { ++ SUBDIRS = assistant \ + pixeltool \ +- qtestlib \ +- designer ++ qtestlib ++ } ++ SUBDIRS += designer + # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig + + linguist.depends = designer +@@ -20,7 +22,7 @@ mac { + SUBDIRS += macdeployqt + } + +-qtHaveModule(dbus): SUBDIRS += qdbus ++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus + + qtNomakeTools( \ + pixeltool \ +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index eaf440b..1778ad1 100644 +--- a/tests/auto/auto.pro ++++ b/tests/auto/auto.pro +@@ -1,14 +1,16 @@ + TEMPLATE=subdirs +-SUBDIRS=\ +- linguist \ +- host.pro \ +- qhelpcontentmodel \ +- qhelpenginecore \ +- qhelpgenerator \ +- qhelpindexmodel \ +- qhelpprojectdata \ +- cmake \ +- installed_cmake ++!linguistonly { ++ SUBDIRS=\ ++ linguist \ ++ host.pro \ ++ qhelpcontentmodel \ ++ qhelpenginecore \ ++ qhelpgenerator \ ++ qhelpindexmodel \ ++ qhelpprojectdata \ ++ cmake \ ++ installed_cmake ++} + + installed_cmake.depends = cmake + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qttools-native.inc b/recipes-qt/qt5/qttools-native.inc new file mode 100644 index 0000000000..cc1e05666f --- /dev/null +++ b/recipes-qt/qt5/qttools-native.inc @@ -0,0 +1,22 @@ +# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git +LICENSE = "LGPL-2.1 | GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +" + +DEPENDS = "qtbase-native" + +QT_MODULE = "qttools" + +require qt5-native.inc + +SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch" + +do_configure() { + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} diff --git a/recipes-qt/qt5/qttools-native_5.0.2.bb b/recipes-qt/qt5/qttools-native_5.0.2.bb new file mode 100644 index 0000000000..2ce7167946 --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.0.2.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "93ddcfdb87c6a784b0a921d09eafbdad" +SRC_URI[sha256sum] = "bb9bcf38dbb429cf884d688793681257876f97a2c0fba08528393a39eec7755b" diff --git a/recipes-qt/qt5/qttools-native_5.1.0.bb b/recipes-qt/qt5/qttools-native_5.1.0.bb new file mode 100644 index 0000000000..1da72a4ac9 --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.1.0.bb @@ -0,0 +1,10 @@ +require qt5-${PV}.inc +require ${PN}.inc + +# LICENSE files are missing in 5.0.0 and 5.0.1 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ +" + +SRC_URI[md5sum] = "f3cc602d4b720a847f4ab0953a82d8ef" +SRC_URI[sha256sum] = "9b9aa948e01bf9d0fc7fa4584ededf9b5b280ee74c334c5790dbc6f9015b3738" diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb new file mode 100644 index 0000000000..bc1ec2a13d --- /dev/null +++ b/recipes-qt/qt5/qttools-native_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "441f3d964301942e417b238b6e71b2ad13b976f0" From 671313d0b5e09e0b49a90ed944cd33fb3d6457b0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 5 Sep 2013 15:16:37 +0200 Subject: [PATCH 227/347] cmake: disable test for Qt5Core | CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | The imported target "Qt5::Core" references the file | | "/qmake" | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | "tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake" | | but not all the files it references. | | Call Stack (most recent call first): | tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists) | tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:130 (include) | Tests/RunCMake/CMakeLists.txt:80 (find_package) Signed-off-by: Martin Jansa --- conf/layer.conf | 2 +- recipes-devtools/cmake/cmake_2.8.11.2.bbappend | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 recipes-devtools/cmake/cmake_2.8.11.2.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index 2aee9a5599..3b47b7f7a3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -12,7 +12,7 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "qt5-layer" BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" diff --git a/recipes-devtools/cmake/cmake_2.8.11.2.bbappend b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend new file mode 100644 index 0000000000..0ad2d2fb48 --- /dev/null +++ b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend @@ -0,0 +1,7 @@ +# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable +# and possibly missing qmake binary (qtbase-native can be removed from sysroot +# e.g. in order to upgrade it, even when there is target qtbase) + +do_configure_prepend() { + sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt +} From c67873216bb476935a753c3597ba91d8029f307b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 3 Aug 2013 15:27:50 +0200 Subject: [PATCH 228/347] recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe * this will make maintaining meta-qt5 a bit easier Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 7 +- recipes-qt/qt5/qt5-5.0.2.inc | 19 -- .../0001-Add-linux-oe-g-platform.patch | 304 ------------------ .../qtbase-5.0.2/0001-Always-build-uic.patch | 31 -- ...ow-to-set-qt.conf-from-the-outside-u.patch | 36 --- .../0003-Add-external-hostbindir-option.patch | 221 ------------- ...tions-temporary-remove-isEmpty-check.patch | 50 --- ...ke-is-already-built-in-qtbase-native.patch | 30 -- ...ding-a-separate-qmake-for-the-target.patch | 29 -- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 31 -- ...-qt_module-Fix-pkgconfig-replacement.patch | 68 ---- ...09-qt_module-Fix-paths-in-.prl-files.patch | 62 ---- ...wayland-scanner-disable-silent-rules.patch | 46 --- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 --- ...Allow-to-add-extra-arguments-to-make.patch | 37 --- .../0013-Disable-mkv8snapshot.patch | 46 --- ...-device-to-be-read-from-env-variable.patch | 34 -- .../0015-qtbase-allow-build-of-examples.patch | 49 --- ...ib-to-be-specified-at-configure-time.patch | 72 ----- ...017-Rename-qAbs-Function-for-timeval.patch | 44 --- ...-QOpenGLPaintDevice-sub-area-support.patch | 152 --------- ...estoring-in-QOpenGLTextureGlyphCache.patch | 47 --- ...20-Use-BGRA-extension-in-bindTexture.patch | 39 --- ...ake-pulseaudio-a-configurable-option.patch | 36 --- ...gure-make-alsa-a-configurable-option.patch | 35 -- ...-make-freetype-a-configurable-option.patch | 35 -- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 84 ----- ...ix-data-corruption-in-readData-metho.patch | 41 --- recipes-qt/qt5/qtbase-native_5.0.2.bb | 11 - recipes-qt/qt5/qtbase_5.0.2.bb | 13 - .../0001-qmltestexample-fix-link.patch | 34 -- ...t-transition-bug-for-horizontal-case.patch | 32 -- ...culation-of-viewPort-for-transitions.patch | 41 --- ...-access-in-QQuickVisualDataModelPriv.patch | 37 --- ...swizzling-on-OpenGL-ES-when-possible.patch | 88 ----- recipes-qt/qt5/qtdeclarative_5.0.2.bb | 15 - recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb | 13 - recipes-qt/qt5/qtimageformats_5.0.2.bb | 7 - ...mkv8snapshot-tool-to-the-native-side.patch | 32 -- ...espect-external-host-bindir-when-set.patch | 31 -- ...p-ABI-detection.-This-work-was-trigg.patch | 190 ----------- recipes-qt/qt5/qtjsbackend-native_5.0.2.bb | 7 - recipes-qt/qt5/qtjsbackend_5.0.2.bb | 11 - recipes-qt/qt5/qtmultimedia_5.0.2.bb | 13 - recipes-qt/qt5/qtquick1_5.0.2.bb | 7 - recipes-qt/qt5/qtscript_5.0.2.bb | 7 - recipes-qt/qt5/qtsvg_5.0.2.bb | 13 - ...build-only-lrelease-lupdate-lconvert.patch | 127 -------- recipes-qt/qt5/qttools-native_5.0.2.bb | 5 - ...should-not-be-a-mandatory-dependency.patch | 46 --- ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 33 -- ...eKHR-requires-the-context-to-be-NULL.patch | 71 ---- ...should-not-be-a-mandatory-dependency.patch | 27 +- ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 4 +- ...eKHR-requires-the-context-to-be-NULL.patch | 6 +- ...d-precision-qualifier-in-fragment-sh.patch | 31 -- recipes-qt/qt5/qtwayland.inc | 2 +- recipes-qt/qt5/qtwayland_5.1.0+git.bb | 18 -- recipes-qt/qt5/qtwayland_git.bb | 24 +- recipes-qt/qt5/qtwebkit-examples_5.0.2.bb | 8 - recipes-qt/qt5/qtwebkit_5.0.2.bb | 7 - recipes-qt/qt5/qtxmlpatterns_5.0.2.bb | 17 - 62 files changed, 29 insertions(+), 2728 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-5.0.2.inc delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch delete mode 100644 recipes-qt/qt5/qtbase-native_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtbase_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch delete mode 100644 recipes-qt/qt5/qtdeclarative_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtimageformats_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtmultimedia_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtquick1_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtscript_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtsvg_5.0.2.bb delete mode 100644 recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch delete mode 100644 recipes-qt/qt5/qttools-native_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch delete mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch delete mode 100644 recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch delete mode 100644 recipes-qt/qt5/qtwayland_5.1.0+git.bb delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtwebkit_5.0.2.bb delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.0.2.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index ea159700cd..81cb8cbb51 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.2", "5.1.0", "5.1.0+git%" +# possible values now "5.1.0", "5.1.0+git%" QT5_VERSION ?= "5.1.0" @@ -19,8 +19,3 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" - -# append % only if it isn't included already -# 5.1.0+git%% won't work and it's exactly where we need to overcome DEFAULT_PREFERENCE with PREFERRED_VERSION -QT5_VERSION_WAYLAND = "${@base_contains('QT5_VERSION', '5.1.0+git%', '${QT5_VERSION}', '${QT5_VERSION}%', d)}" -PREFERRED_VERSION_qtwayland = "${QT5_VERSION_WAYLAND}" diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc deleted file mode 100644 index c04b3a2aa4..0000000000 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa - -QT_VERSION ?= "${PV}" - -# it's different for RC versions -QT_VERSION_DIR ?= "${QT_VERSION}" - -SRC_URI += " \ - http://download.qt-project.org/archive/qt/5.0/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ -" - -S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" - -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch deleted file mode 100644 index fdd96fee6f..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ /dev/null @@ -1,304 +0,0 @@ -From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/22] 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 - -* 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: Pending - -Signed-off-by: Martin Jansa ---- - configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ - mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 187 insertions(+), 7 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 2ea1ea4..6db4577 100755 ---- a/configure -+++ b/configure -@@ -216,6 +216,16 @@ getQMakeConf() - getQMakeConf3 "$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 -@@ -224,6 +234,16 @@ getXQMakeConf() - getQMakeConf3 "$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" - for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" -@@ -2636,7 +2668,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then - CFG_QGTKSTYLE=no - fi - --QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` - - TEST_COMPILER=$QMAKE_CONF_COMPILER - if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then -@@ -2645,7 +2677,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 -@@ -3613,6 +3645,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..." -@@ -3651,11 +3691,11 @@ 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_CXXFLAGS -- setBootstrapVariable QMAKE_LFLAGS -+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CFLAGS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS -+ setBootstrapEvalVariable QMAKE_LFLAGS - - if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" -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 --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch deleted file mode 100644 index 3f2e3fd925..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Always-build-uic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] 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. - -Signed-off-by: Mikko Levonmaa ---- - src/tools/tools.pro | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/tools.pro b/src/tools/tools.pro -index c67d6bf..b6f3b39 100644 ---- a/src/tools/tools.pro -+++ b/src/tools/tools.pro -@@ -1,8 +1,8 @@ - TEMPLATE = subdirs - --TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc -+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic - contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml --!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic -+ - # Set subdir and respective target name - src_tools_bootstrap.subdir = $$PWD/bootstrap - src_tools_bootstrap.target = sub-tools-bootstrap --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index f59089cfec..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/22] 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, 4 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 5fb9640..6b40731 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -138,7 +138,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(); --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch deleted file mode 100644 index ce27eb6b60..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 15 ++++++++++++++- - mkspecs/features/qt_functions.prf | 5 ++++- - mkspecs/features/qt_tool.prf | 2 +- - qmake/property.cpp | 1 + - qtbase.pro | 15 +++++++++++---- - src/corelib/global/qlibraryinfo.cpp | 3 ++- - src/corelib/global/qlibraryinfo.h | 1 + - tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 42 insertions(+), 8 deletions(-) - -diff --git a/configure b/configure -index 6db4577..1ca5b4e 100755 ---- a/configure -+++ b/configure -@@ -930,6 +930,7 @@ CFG_GCC_SYSROOT="yes" - QT_HOST_PREFIX= - QT_HOST_BINS= - QT_HOST_DATA= -+QT_EXTERNAL_HOST_BINS= - - #flags for SQL drivers - QT_CFLAGS_PSQL= -@@ -1028,7 +1029,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style options that pass an argument -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1213,6 +1214,9 @@ while [ "$#" -gt 0 ]; do - hostbindir) - QT_HOST_BINS="$VAL" - ;; -+ external-hostbindir) -+ QT_EXTERNAL_HOST_BINS="$VAL" -+ ;; - pkg-config) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PKGCONFIG="$VAL" -@@ -2941,6 +2945,11 @@ else - QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` - fi - -+# 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 -+ - #------------------------------------------------------------------------------- - # help - interactive parts of the script _after_ this section please - #------------------------------------------------------------------------------- -@@ -3107,6 +3116,9 @@ 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 -@@ -3584,6 +3596,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { - "qt_hpfxpath=$QT_HOST_PREFIX", - "qt_hbinpath=$QT_HOST_BINS", - "qt_hdatpath=$QT_HOST_DATA", -+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", - "qt_targspec=$shortxspec", - "qt_hostspec=$shortspec", - #endif -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 8cd2473..876f657 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { - defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS]/$$2 -+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ $$1 = $$[QT_HOST_BINS]/$$2 -+ } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { - exists($$eval($$1).bat) { - $$1 = $$eval($$1).bat -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 9d50856..8a636c7 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:force_independent { -+!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index c4fbcd6..c1b7a9f 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -74,6 +74,7 @@ static const struct { - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, - { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, - { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, -+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, - { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, - { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, - }; -diff --git a/qtbase.pro b/qtbase.pro -index 4c41cff..997ea6d 100644 ---- a/qtbase.pro -+++ b/qtbase.pro -@@ -68,17 +68,24 @@ CONFIG -= qt - - #qmake - qmake.path = $$[QT_HOST_BINS] -+qmake.files = $$OUT_PWD/bin/qmake -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 - - #syncqt - syncqt.path = $$[QT_HOST_BINS] - syncqt.files = $$PWD/bin/syncqt --equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt -+} -+equals(QMAKE_HOST.os, Windows) { -+ syncqt.files = $${syncqt.files}.bat -+} - INSTALLS += syncqt - - # If we are doing a prefix build, create a "module" pri which enables -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6b40731..139a60f 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() - */ - - static const struct { -- char key[19], value[13]; -+ char key[21], value[13]; - } qtConfEntries[] = { - { "Prefix", "." }, - { "Documentation", "doc" }, // should be ${Data}/doc -@@ -295,6 +295,7 @@ static const struct { - { "HostPrefix", "" }, - { "HostBinaries", "bin" }, - { "HostData", "." }, -+ { "ExternalHostBinaries", "" }, - { "TargetSpec", "" }, - { "HostSpec", "" }, - #endif -diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 054231b..37fe529 100644 ---- a/src/corelib/global/qlibraryinfo.h -+++ b/src/corelib/global/qlibraryinfo.h -@@ -85,6 +85,7 @@ public: - HostPrefixPath, - HostBinariesPath, - HostDataPath, -+ ExternalHostBinariesPath, - TargetSpecPath, - HostSpecPath, - LastHostPath = HostSpecPath, -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 22ee456..cfc6f97 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -1156,6 +1156,13 @@ void Configure::parseCmdLine() - dictionary[ "QT_HOST_DATA" ] = 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) -@@ -3657,6 +3664,7 @@ void Configure::generateQConfigCpp() - << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl - << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl - << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl -+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl - << " \"qt_targspec=" << targSpec << "\"," << endl - << " \"qt_hostspec=" << hostSpec << "\"," << endl - << "#endif" << endl --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index cd0ca88498..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/22] 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]. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS]/$$2 - } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 8a636c7..0dad97c 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:force_independent:!exists($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index dd8abfa7a6..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/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/22] 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.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index 43504c593e..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/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/22] 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.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 20e5e75731..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - 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 cfc6f97..d0e17fa 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3087,8 +3087,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index 83da0d2388..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement - -* 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1132943..7fbfd8d 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -128,18 +128,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - } - - unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace - } - - unix|win32-g++* { --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 5687e8f1ab..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 7fbfd8d..226119f 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -132,17 +132,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index f5b5338597..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/22] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 90e1e0f..0750849 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index a5e6a6efd3..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index 546bed2..34074ee 100755 ---- a/configure -+++ b/configure -@@ -740,20 +740,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 60d4a5cc18..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..de48b07 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # 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) --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch deleted file mode 100644 index 7f4d47e77a..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 78b716520396b5317a8b91dbca183483bea8b1d2 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/22] Disable mkv8snapshot - -It seems to generate code that throws SIGILL, so disabling it - -Program received signal SIGILL, Illegal instruction. -0x26312c60 in ?? () -(gdb) bt - function=..., receiver=..., argc=1978934572, args=0x7efff254, - has_pending_exception=0x7efff277, qml=...) - at ../3rdparty/v8/src/execution.cc:125 - argc=1, argv=0x7efff254, pending_exception=0x7efff277, - convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 - receiver=, argc=, argv=, - pending_exception=0x7efff277, convert_receiver=false) - at ../3rdparty/v8/src/execution.cc:161 - data=, exc=0x7efff277) - at ../3rdparty/v8/src/execution.cc:734 - at ../3rdparty/v8/src/api.cc:4742 - at qml/v8/qv8contextwrapper.cpp:155 - ownership=) at qml/v8/qv8engine.cpp:155 - parent=) at qml/v8/qjsengine.cpp:192 - -Signed-off-by: Mikko Levonmaa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 34074ee..ac09bbf 100755 ---- a/configure -+++ b/configure -@@ -799,7 +799,7 @@ CFG_NOBUILD_PARTS="" - CFG_SKIP_MODULES="" - CFG_RELEASE_QMAKE=no - CFG_AUDIO_BACKEND=auto --CFG_V8SNAPSHOT=auto -+CFG_V8SNAPSHOT=no - CFG_QML_DEBUG=yes - CFG_JAVASCRIPTCORE_JIT=auto - CFG_PKGCONFIG=auto --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch deleted file mode 100644 index d407deb41a..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f8336efd143109c3478e5548360248f99b645548 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/22] enables tslib device to be read from env variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -from : -https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch - -Signed-off-by: Eric Bénard ---- - src/plugins/generic/tslib/qtslib.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp -index 6986fd5..2ed4a69 100644 ---- a/src/plugins/generic/tslib/qtslib.cpp -+++ b/src/plugins/generic/tslib/qtslib.cpp -@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, - qDebug() << "QTsLibMouseHandler" << key << specification; - setObjectName(QLatin1String("TSLib Mouse Handler")); - -- QByteArray device = "/dev/input/event1"; -+ QByteArray device = qgetenv("TSLIB_TSDEVICE"); -+ if(device.isEmpty()) -+ device = "/dev/input/event1"; - if (specification.startsWith("/dev/")) - device = specification.toLocal8Bit(); - --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch deleted file mode 100644 index d824eed1f4..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a21c676a69388cd8cdf0bb28184de2bee58def0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/22] qtbase: allow build of examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this revert the following commit : - -commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 -Author: Oswald Buddenhagen -Date: Fri Dec 21 19:36:12 2012 +0100 - - do not actually build examples in production builds - - -developer-build enables an actual build of examples, based on the - assumption that developers want to test it (it can be still disabled - with -nomake examples). regular users otoh want only the examples - sources installed. - - Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 - Reviewed-by: Joerg Bornemann - -Signed-off-by: Eric Bénard ---- - mkspecs/features/qt_example_installs.prf | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 479a16a..ca1b0c7 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - allfiles -= doc - !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") - } -- -- # Do not actually build the examples in production builds with -prefix -- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { -- TEMPLATE = aux -- CONFIG -= have_target qt staticlib dll -- SOURCES = -- INSTALLS -= target -- } - } --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch deleted file mode 100644 index 882d7de58a..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001 -From: Michael Brasser -Date: Tue, 26 Mar 2013 09:22:51 -0500 -Subject: [PATCH 16/22] Allow tslib to be specified at configure time. - -Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e -Reviewed-by: Oswald Buddenhagen ---- - configure | 20 ++++++++++++++++++++ - src/plugins/generic/generic.pro | 4 ++++ - 2 files changed, 24 insertions(+) - -diff --git a/configure b/configure -index ac09bbf..188e941 100755 ---- a/configure -+++ b/configure -@@ -829,6 +829,7 @@ CFG_KMS=auto - CFG_LIBUDEV=auto - CFG_OBSOLETE_WAYLAND=no - CFG_EVDEV=auto -+CFG_TSLIB=no - CFG_NIS=auto - CFG_CUPS=auto - CFG_ICONV=auto -@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ tslib) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_TSLIB="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - cups) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_CUPS="$VAL" -@@ -4815,6 +4823,18 @@ if [ "$CFG_EVDEV" = "no" ]; then - QMakeVar add DEFINES QT_NO_EVDEV - fi - -+if [ "$CFG_TSLIB" != "no" ]; then -+ if compileTest unix/tslib "tslib"; then -+ CFG_TSLIB=yes -+ QT_CONFIG="$QT_CONFIG tslib" -+ elif [ "$CFG_TSLIB" = "yes" ]; then -+ echo "The tslib functionality test failed!" -+ exit 1 -+ else -+ CFG_TSLIB=no -+ fi -+fi -+ - # Check we actually have X11 :-) - if compileTest x11/xlib "XLib"; then - QT_CONFIG="$QT_CONFIG xlib" -diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro -index 078db2f..18a8295 100644 ---- a/src/plugins/generic/generic.pro -+++ b/src/plugins/generic/generic.pro -@@ -5,3 +5,7 @@ TEMPLATE = subdirs - contains(QT_CONFIG, evdev) { - SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet - } -+ -+contains(QT_CONFIG, tslib) { -+ SUBDIRS += tslib -+} --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch deleted file mode 100644 index 78a6b48ab4..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 126d2c4beff40bc51a1912a752b23c178eac59b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= -Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH 17/22] Rename qAbs Function for timeval - -This decouples it from qAbs which is declared as a constexpr under -certain compilation flags and enables for qtbase to be compiled with -GCC 4.8 - -Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -Reviewed-by: Thiago Macieira - -Upstream-Status: Backported from stable branch -Signed-off-by: Martin Jansa ---- - src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp -index 0eee425..7a29247 100644 ---- a/src/corelib/kernel/qtimerinfo_unix.cpp -+++ b/src/corelib/kernel/qtimerinfo_unix.cpp -@@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime() - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { -@@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - /* --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch deleted file mode 100644 index cbf4aed1f4..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch +++ /dev/null @@ -1,152 +0,0 @@ -From c2c17a3198c85366f34b24abc80b20f27307d751 Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 18/22] 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 0b3d9dc..5f4f1c9 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; - -@@ -158,6 +159,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. - */ -@@ -226,6 +233,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 66850c7..6f8a849 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); - -diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 9fd8a7a..df29159 100644 ---- a/src/gui/opengl/qopenglpaintengine.cpp -+++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1935,7 +1935,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; -@@ -2023,7 +2026,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(); -@@ -2066,6 +2069,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); - } -@@ -2074,14 +2078,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 93e1b42..d84e8c7 100644 ---- a/src/gui/opengl/qopenglpaintengine_p.h -+++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -261,6 +261,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 b751629..8822faf 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.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch deleted file mode 100644 index e47c7b6daa..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ /dev/null @@ -1,47 +0,0 @@ -From edea45b25b50932c8c072679d36e97b3cc3c1326 Mon Sep 17 00:00:00 2001 -From: Valery Volgutov -Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH 19/22] Fix FBO restoring in QOpenGLTextureGlyphCache - -QOpenGLTextureGlyphCache::restoreTextureData restores FBO which -was binded before restoreTextureData call. More specifically, -it restores QOpenGLContextPrivate's current_fbo member. This works -if FBO was binded by QOpenGLFramebufferObject but not if FBO was -binded using glBindFramebufferObject and rendering done via -QOpenGLPaintDevice. - -This patch fixes it by querying current FBO using -GL_FRAMEBUFFER_BINDING query and restoring it. - -Upstream-Status: Backport -https://codereview.qt-project.org/#change,56608 ---- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 8822faf..022356a 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - return; - } - -+ GLuint saveFbo; -+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); -+ - int oldWidth = m_textureResource->m_width; - int oldHeight = m_textureResource->m_height; - -@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - glDeleteTextures(1, &tmp_texture); - glDeleteTextures(1, &oldTexture); - -- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); -+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); - - if (pex != 0) { - glViewport(pex->x, pex->y, pex->width, pex->height); --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch deleted file mode 100644 index fb384f7619..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 87380175cdb88ceadeec5773d8bc40ec08c4e3d6 Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH 20/22] Use BGRA extension in bindTexture - -Upstream-Status: Pending - -Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 ---- - src/gui/opengl/qopengltexturecache.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index fffc368..11c8b59 100644 ---- a/src/gui/opengl/qopengltexturecache.cpp -+++ b/src/gui/opengl/qopengltexturecache.cpp -@@ -171,7 +171,7 @@ static inline void qgl_byteSwapImage(QImage &img) - } - } - } -- -+#include - GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, const QImage &image) - { - GLuint id; -@@ -180,9 +180,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con - - QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); - -- qgl_byteSwapImage(tx); -- -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); -+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); - - int cost = tx.width() * tx.height() * 4 / 1024; - m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch deleted file mode 100644 index 3c723f6fcd..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0021-configure-make-pulseaudio-a-configurable-option.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 647c9bb3a33e8cc5093d46b1a08d38f3f2002b74 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 21/23] configure: make pulseaudio a configurable option - -Allows disabling pulseaudio support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 188e941..24dcd3a 100755 ---- a/configure -+++ b/configure -@@ -1848,6 +1848,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.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch deleted file mode 100644 index b5e0bf772b..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0022-configure-make-alsa-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 33a0f6ff196e366eb51dc2fb937636b087f1719f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 19 Jul 2013 23:21:28 +0200 -Subject: [PATCH 22/23] configure: make alsa a configurable option - -Allows disabling alsa support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 24dcd3a..2f46604 100755 ---- a/configure -+++ b/configure -@@ -1855,6 +1855,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch deleted file mode 100644 index f88bb7e0ec..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0023-configure-make-freetype-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 113e48ed082315424931407717b72a7a5c011944 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 20 Jul 2013 10:56:37 +0200 -Subject: [PATCH 23/23] configure: make freetype a configurable option - -Allows disabling freetype support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 2f46604..c2cf3b5 100755 ---- a/configure -+++ b/configure -@@ -1862,6 +1862,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ freetype) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then -+ CFG_LIBFREETYPE="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch deleted file mode 100644 index 9419b81b78..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0e6b7bcb1c02750368722d1770b0098ce9b28327 Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to - host binaries - -Upstream-Status: Inappropiate (configuration) - -Signed-off-by: Simon Busch ---- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 4e0fcda..925a335 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - endif() -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - # For CMake automoc feature -@@ -32,7 +32,7 @@ if (NOT TARGET Qt5::rcc) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - endif() -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 8ecf7ce..af86a88 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - endif() -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - endif() -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index d9abb45..ca17862 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::uic) - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - IMPORTED_LOCATION \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\" - !!ELSE -- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\" -+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\" - !!ENDIF - ) - endif() --- -1.8.1.2 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index 33e77eaca8..0000000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af96c6fed931564c95037539f07e9c8e33c69529 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: Backport [https://codereview.qt-project.org/#change,61698] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-32534 -Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 -Reviewed-by: Jonathan Liu -Reviewed-by: Shane Kearns ---- - src/network/access/qhttpmultipart.cpp | 3 +- - .../access/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 4397ef8..5985ed9 100644 ---- a/src/network/access/qhttpmultipart.cpp -+++ b/src/network/access/qhttpmultipart.cpp -@@ -497,7 +497,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-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb deleted file mode 100644 index b2bdcab0ee..0000000000 --- a/recipes-qt/qt5/qtbase-native_5.0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r3" - -SRC_URI += " \ - file://0017-Rename-qAbs-Function-for-timeval.patch \ -" - -SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" -SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb deleted file mode 100644 index be7bcf53e0..0000000000 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r3" - -SRC_URI += " \ - file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ - file://0017-Rename-qAbs-Function-for-timeval.patch \ - file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ -" - -SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" -SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch deleted file mode 100644 index 7ed95e4bcf..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.0.2/0001-qmltestexample-fix-link.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e22cb54286083886be5081332de2f64ab0b78b4b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sun, 26 May 2013 14:26:19 +0200 -Subject: [PATCH] qmltestexample: fix link -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -else we get : -ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found - -Upstream-Status: Inappropriate - -Signed-off-by: Eric Bénard ---- - examples/qmltest/qmltest/qmltest.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro -index b5893c5..1b00e6c 100644 ---- a/examples/qmltest/qmltest/qmltest.pro -+++ b/examples/qmltest/qmltest/qmltest.pro -@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml - # This code exists solely for the purpose of building this example - # inside the examples/ hierarchy. - --QT += qml qmltest -+QT += qml qmltest quick - - macx: CONFIG -= app_bundle - --- -1.8.1.4 - diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch deleted file mode 100644 index 91740ac75d..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.0.2/0002-Fix-displacement-transition-bug-for-horizontal-case.patch +++ /dev/null @@ -1,32 +0,0 @@ -From eb11863cc40048e84cb383ae9e29b5929170a63d Mon Sep 17 00:00:00 2001 -From: Guenter Schwann -Date: Wed, 27 Feb 2013 15:52:03 +0100 -Subject: [PATCH 2/5] Fix displacement transition bug for horizontal case - -Task-number: QTBUG-29944 - -Upstream-Status: Backport https://codereview.qt-project.org/49226 -Signed-off-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I23381f7a1d2c8d3c6df007b5b11c12b0db3bb1e9 ---- - src/quick/items/qquickitemview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index b73fb8c..1c74288 100644 ---- a/src/quick/items/qquickitemview.cpp -+++ b/src/quick/items/qquickitemview.cpp -@@ -2115,7 +2115,7 @@ void QQuickItemViewPrivate::prepareVisibleItemTransitions() - return; - - // must call for every visible item to init or discard transitions -- QRectF viewBounds(0, position(), q->width(), q->height()); -+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); - for (int i=0; iprepareTransition(transitioner, viewBounds); - } --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index 05451af506..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.0.2/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3dfa028b27e171cb2494b22f0346be1390310ea6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= -Date: Wed, 5 Jun 2013 19:23:32 +0200 -Subject: [PATCH 3/5] Fix wrong calculation of viewPort for transitions - -Viewport is calculated wrong for horizontal layout in a second instance - -Task-number: QTBUG-29944 -Task-Number: QTBUG-31546 - -Upstream-Status: Pending - -Looks like backport of https://codereview.qt-project.org/49226 but this -one was applied in previous patch, this change looks the same but is -in different part of qquickitemview.cpp and ISN'T applied yet in dev -branch. - -Signed-off-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe ---- - src/quick/items/qquickitemview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index 1c74288..b316af9 100644 ---- a/src/quick/items/qquickitemview.cpp -+++ b/src/quick/items/qquickitemview.cpp -@@ -1816,7 +1816,7 @@ void QQuickItemViewPrivate::layout() - - prepareVisibleItemTransitions(); - -- QRectF viewBounds(0, position(), q->width(), q->height()); -+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); - for (QList::Iterator it = releasePendingTransition.begin(); - it != releasePendingTransition.end(); ) { - FxViewItem *item = *it; --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch deleted file mode 100644 index 0182248e3e..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.0.2/0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch +++ /dev/null @@ -1,37 +0,0 @@ -From adb69cabeacbe14a4439473107000d6e94d8d033 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= -Date: Mon, 3 Jun 2013 13:40:09 +0200 -Subject: [PATCH 4/5] Fix null-pointer access in QQuickVisualDataModelPrivate - -I observed null cachItem->contextData which lead to null-pointer access -on cacheItem->contextData->destroy(). - -Task-number: QTBUG-31439 - -Upstream-Status: Backport https://codereview.qt-project.org/57789 - -Signed-of-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 ---- - src/quick/items/qquickvisualdatamodel.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp -index d2e50e8..a460e7f 100644 ---- a/src/quick/items/qquickvisualdatamodel.cpp -+++ b/src/quick/items/qquickvisualdatamodel.cpp -@@ -817,7 +817,8 @@ void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *in - delete cacheItem->object; - cacheItem->object = 0; - cacheItem->scriptRef -= 1; -- cacheItem->contextData->destroy(); -+ if (cacheItem->contextData) -+ cacheItem->contextData->destroy(); - cacheItem->contextData = 0; - if (!cacheItem->isReferenced()) { - removeCacheItem(cacheItem); --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch b/recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch deleted file mode 100644 index 92be7ef86d..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.0.2/0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 9d85c3c5823c6f73db245d4de786d911fd96edfd Mon Sep 17 00:00:00 2001 -From: Florian Haenel -Date: Sat, 8 Jun 2013 00:34:35 +0200 -Subject: [PATCH 5/5] Avoid swizzling on OpenGL ES when possible - -Add support for APPLE_texture_format_BGRA8888, -IMG_texture_format_BGRA8888, -EXT_texture_format_BGRA8888 and EXT_bgra. The apple one acts -just like the desktop EXT_bgra one, so they need slightly -different handling than the ES extensions. - -This change also has the benefit that we no longer have a dedicated -ES path. - -Upstream-Status: Backport https://codereview.qt-project.org/46549 -Signed-off-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I5ecb0a02c3a7bd984d6752fa87163726118b93de ---- - src/quick/scenegraph/util/qsgtexture.cpp | 28 ++++++++++++++++++++++------ - 1 file changed, 22 insertions(+), 6 deletions(-) - -diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp -index 16cc461..3d574f3 100644 ---- a/src/quick/scenegraph/util/qsgtexture.cpp -+++ b/src/quick/scenegraph/util/qsgtexture.cpp -@@ -65,6 +65,10 @@ - #include - #endif - -+#ifndef GL_BGRA -+#define GL_BGRA 0x80E1 -+#endif -+ - QT_BEGIN_NAMESPACE - - inline static bool isPowerOfTwo(int x) -@@ -523,7 +527,6 @@ QSGPlainTexture::~QSGPlainTexture() - glDeleteTextures(1, &m_texture_id); - } - --#ifdef QT_OPENGL_ES - void qsg_swizzleBGRAToRGBA(QImage *image) - { - const int width = image->width(); -@@ -534,7 +537,6 @@ void qsg_swizzleBGRAToRGBA(QImage *image) - p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00); - } - } --#endif - - void QSGPlainTexture::setImage(const QImage &image) - { -@@ -621,12 +623,26 @@ void QSGPlainTexture::bind() - - updateBindOptions(m_dirty_bind_options); - -+ GLenum externalFormat = GL_RGBA; -+ GLenum internalFormat = GL_RGBA; -+ -+ const char *extensions = (const char *) glGetString(GL_EXTENSIONS); -+ if (strstr(extensions, "GL_EXT_bgra")) { -+ externalFormat = GL_BGRA; - #ifdef QT_OPENGL_ES -- qsg_swizzleBGRAToRGBA(&tmp); -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmp.constBits()); --#else -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_BGRA, GL_UNSIGNED_BYTE, tmp.constBits()); -+ internalFormat = GL_BGRA; - #endif -+ } else if (strstr(extensions, "GL_APPLE_texture_format_BGRA8888")) { -+ externalFormat = GL_BGRA; -+ } else if (strstr(extensions, "GL_EXT_texture_format_BGRA8888") -+ || strstr(extensions, "GL_IMG_texture_format_BGRA8888")) { -+ externalFormat = GL_BGRA; -+ internalFormat = GL_BGRA; -+ } else { -+ qsg_swizzleBGRAToRGBA(&tmp); -+ } -+ -+ glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, externalFormat, GL_UNSIGNED_BYTE, tmp.constBits()); - - if (m_has_mipmaps) { - QOpenGLContext *ctx = QOpenGLContext::currentContext(); --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb deleted file mode 100644 index 71f8ff550a..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI += " \ - file://0001-qmltestexample-fix-link.patch \ - file://0002-Fix-displacement-transition-bug-for-horizontal-case.patch \ - file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ - file://0004-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ - file://0005-Avoid-swizzling-on-OpenGL-ES-when-possible.patch \ -" - -SRC_URI[md5sum] = "55ab45a7a17db5b202b225603a35a37c" -SRC_URI[sha256sum] = "dcfcc6c0d1913d285dd7b42dd9bc457c304f3e3074a1e0d875fff1e9a8318520" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb deleted file mode 100644 index ee5f3abe1d..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.2 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "r1" - -SRC_URI[md5sum] = "3d4475a4702f7bbe8064f69e17f1e8dd" -SRC_URI[sha256sum] = "944399c5795b83b8f6b5e4ccec763ce5192f0e99b5e6d256f2b43a3165ee3016" diff --git a/recipes-qt/qt5/qtimageformats_5.0.2.bb b/recipes-qt/qt5/qtimageformats_5.0.2.bb deleted file mode 100644 index e53c8633d7..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI[md5sum] = "e397a4237f51cfef7a3b38ad29b831d7" -SRC_URI[sha256sum] = "93bd13a47002f188a8a83a5c742d396a2008a545fc22d58df442c4c070a463b7" diff --git a/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch deleted file mode 100644 index ec0c22d0f9..0000000000 --- a/recipes-qt/qt5/qtjsbackend-5.0.2/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 293e982e084661e0caf686737dcdcda9e2e3e083 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 11:20:13 -0800 -Subject: [PATCH 1/3] Install the mkv8snapshot tool to the native side - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro -index 16beb02..5e327f7 100644 ---- a/src/tools/mkv8snapshot/mkv8snapshot.pro -+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro -@@ -24,5 +24,10 @@ unix:LIBS += -lpthread - - # We don't need to install this tool, it's only used for building v8. - # However we do have to make sure that 'make install' builds it. --dummytarget.CONFIG = dummy_install --INSTALLS += dummytarget -+#dummytarget.CONFIG = dummy_install -+#INSTALLS += dummytarget -+ -+# Install the tool so that during target cross compilation we have access to the native side binary -+target.path = $$[QT_HOST_BINS] -+INSTALLS += target -+ --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch deleted file mode 100644 index 86d841390c..0000000000 --- a/recipes-qt/qt5/qtjsbackend-5.0.2/0002-v8.pro-respect-external-host-bindir-when-set.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fa85676a52fb6e12e6db85ace4b6a2cfc1d5239a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 02:45:01 +0200 -Subject: [PATCH 2/3] v8.pro: respect external-host-bindir, when set - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - src/v8/v8.pro | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/v8/v8.pro b/src/v8/v8.pro -index 2be6a19..d3da4e1 100644 ---- a/src/v8/v8.pro -+++ b/src/v8/v8.pro -@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. - include(v8.pri) - - contains(QT_CONFIG, v8snapshot) { -- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() -+ !exists($$mkv8snapshot.tool): \ -+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() -+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} - DUMMY_FILE = v8.pro - mkv8snapshot.input = DUMMY_FILE - mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch b/recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch deleted file mode 100644 index 6688d8d458..0000000000 --- a/recipes-qt/qt5/qtjsbackend-5.0.2/0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch +++ /dev/null @@ -1,190 +0,0 @@ -From d8a3566b013ba581e638cf2b960a8488d5fc9d64 Mon Sep 17 00:00:00 2001 -From: Sergio Martins -Date: Wed, 20 Feb 2013 22:34:46 +0000 -Subject: [PATCH 3/3] [V8] Cleanup hardfp ABI detection. This work was - triggered by issue 2140. - -Upstream Patch: https://chromiumcodereview.appspot.com/10713009 - -Task-Number: QTBUG-28890 -Change-Id: Id073388fbbffa2ad9b1cea0ab42e1d6e47862a36 -Reviewed-by: Sean Harmer -Reviewed-by: Simon Hausmann ---- - src/3rdparty/v8/src/platform-linux.cc | 70 ++++++++++++++++------------------ - src/3rdparty/v8/src/platform-qnx.cc | 71 ++++++++++++++++------------------- - 2 files changed, 65 insertions(+), 76 deletions(-) - -diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc -index f6db423..18f59dd 100644 ---- a/src/3rdparty/v8/src/platform-linux.cc -+++ b/src/3rdparty/v8/src/platform-linux.cc -@@ -161,47 +161,41 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { - } - - --// Simple helper function to detect whether the C code is compiled with --// option -mfloat-abi=hard. The register d0 is loaded with 1.0 and the register --// pair r0, r1 is loaded with 0.0. If -mfloat-abi=hard is pased to GCC then --// calling this will return 1.0 and otherwise 0.0. --static void ArmUsingHardFloatHelper() { -- asm("mov r0, #0":::"r0"); --#if defined(__VFP_FP__) && !defined(__SOFTFP__) -- // Load 0x3ff00000 into r1 using instructions available in both ARM -- // and Thumb mode. -- asm("mov r1, #3":::"r1"); -- asm("mov r2, #255":::"r2"); -- asm("lsl r1, r1, #8":::"r1"); -- asm("orr r1, r1, r2":::"r1"); -- asm("lsl r1, r1, #20":::"r1"); -- // For vmov d0, r0, r1 use ARM mode. --#ifdef __thumb__ -- asm volatile( -- "@ Enter ARM Mode \n\t" -- " adr r3, 1f \n\t" -- " bx r3 \n\t" -- " .ALIGN 4 \n\t" -- " .ARM \n" -- "1: vmov d0, r0, r1 \n\t" -- "@ Enter THUMB Mode\n\t" -- " adr r3, 2f+1 \n\t" -- " bx r3 \n\t" -- " .THUMB \n" -- "2: \n\t":::"r3"); -+bool OS::ArmUsingHardFloat() { -+ // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify -+ // the Floating Point ABI used (PCS stands for Procedure Call Standard). -+ // We use these as well as a couple of other defines to statically determine -+ // what FP ABI used. -+ // GCC versions 4.4 and below don't support hard-fp. -+ // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or -+ // __ARM_PCS_VFP. -+ -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) -+#if GCC_VERSION >= 40600 -+#if defined(__ARM_PCS_VFP) -+ return true; - #else -- asm("vmov d0, r0, r1"); --#endif // __thumb__ --#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) -- asm("mov r1, #0":::"r1"); --} -+ return false; -+#endif - -+#elif GCC_VERSION < 40500 -+ return false; - --bool OS::ArmUsingHardFloat() { -- // Cast helper function from returning void to returning double. -- typedef double (*F)(); -- F f = FUNCTION_CAST(FUNCTION_ADDR(ArmUsingHardFloatHelper)); -- return f() == 1.0; -+#else -+#if defined(__ARM_PCS_VFP) -+ return true; -+#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) -+ return false; -+#else -+#error "Your version of GCC does not report the FP ABI compiled for." \ -+ "Please report it on this issue" \ -+ "http://code.google.com/p/v8/issues/detail?id=2140" -+ -+#endif -+#endif -+#undef GCC_VERSION - } - #endif // def __arm__ - -diff --git a/src/3rdparty/v8/src/platform-qnx.cc b/src/3rdparty/v8/src/platform-qnx.cc -index bf9f5ba..46d69b8 100644 ---- a/src/3rdparty/v8/src/platform-qnx.cc -+++ b/src/3rdparty/v8/src/platform-qnx.cc -@@ -139,48 +139,43 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { - } - - --// Simple helper function to detect whether the C code is compiled with --// option -mfloat-abi=hard. The register d0 is loaded with 1.0 and the register --// pair r0, r1 is loaded with 0.0. If -mfloat-abi=hard is pased to GCC then --// calling this will return 1.0 and otherwise 0.0. --static void ArmUsingHardFloatHelper() { -- asm("mov r0, #0"); --#if defined(__VFP_FP__) && !defined(__SOFTFP__) -- // Load 0x3ff00000 into r1 using instructions available in both ARM -- // and Thumb mode. -- asm("mov r1, #3"); -- asm("mov r2, #255"); -- asm("lsl r1, r1, #8"); -- asm("orr r1, r1, r2"); -- asm("lsl r1, r1, #20"); -- // For vmov d0, r0, r1 use ARM mode. --#ifdef __thumb__ -- asm volatile( -- "@ Enter ARM Mode \n\t" -- " adr r3, 1f \n\t" -- " bx r3 \n\t" -- " .ALIGN 4 \n\t" -- " .ARM \n" -- "1: vmov d0, r0, r1 \n\t" -- "@ Enter THUMB Mode\n\t" -- " adr r3, 2f+1 \n\t" -- " bx r3 \n\t" -- " .THUMB \n" -- "2: \n\t"); -+bool OS::ArmUsingHardFloat() { -+ // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify -+ // the Floating Point ABI used (PCS stands for Procedure Call Standard). -+ // We use these as well as a couple of other defines to statically determine -+ // what FP ABI used. -+ // GCC versions 4.4 and below don't support hard-fp. -+ // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or -+ // __ARM_PCS_VFP. -+ -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) -+#if GCC_VERSION >= 40600 -+#if defined(__ARM_PCS_VFP) -+ return true; - #else -- asm("vmov d0, r0, r1"); --#endif // __thumb__ --#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) -- asm("mov r1, #0"); --} -+ return false; -+#endif - -+#elif GCC_VERSION < 40500 -+ return false; - --bool OS::ArmUsingHardFloat() { -- // Cast helper function from returning void to returning double. -- typedef double (*F)(); -- F f = FUNCTION_CAST(FUNCTION_ADDR(ArmUsingHardFloatHelper)); -- return f() == 1.0; -+#else -+#if defined(__ARM_PCS_VFP) -+ return true; -+#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) -+ return false; -+#else -+#error "Your version of GCC does not report the FP ABI compiled for." \ -+ "Please report it on this issue" \ -+ "http://code.google.com/p/v8/issues/detail?id=2140" -+ -+#endif -+#endif -+#undef GCC_VERSION - } -+ - #endif // def __arm__ - - --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb deleted file mode 100644 index 83832d8604..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" -SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb deleted file mode 100644 index b59a3ebb40..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI += " \ - file://0003-V8-Cleanup-hardfp-ABI-detection.-This-work-was-trigg.patch \ -" - -SRC_URI[md5sum] = "610f011757755888153cb2004c04446f" -SRC_URI[sha256sum] = "65071ab9ab7d9024b7ba6d128a1c97ac09cf1b37818affb4238e4ba7d6665cc0" diff --git a/recipes-qt/qt5/qtmultimedia_5.0.2.bb b/recipes-qt/qt5/qtmultimedia_5.0.2.bb deleted file mode 100644 index 17d9de0acc..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.0.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.2 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "r1" - -SRC_URI[md5sum] = "f0902250974440c9c63569112a67440c" -SRC_URI[sha256sum] = "fffc7bd71e6cb2853da3c90d7f9794583e7a83e4eeb6fea039a2efac53688834" diff --git a/recipes-qt/qt5/qtquick1_5.0.2.bb b/recipes-qt/qt5/qtquick1_5.0.2.bb deleted file mode 100644 index ddef81af79..0000000000 --- a/recipes-qt/qt5/qtquick1_5.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI[md5sum] = "22cd03e2e2aadbc5e2ce324a3526fa8b" -SRC_URI[sha256sum] = "2a2235f4f4afd5bf8c6960efafbe89f8c443f174fb22931d48f566660cfcea9a" diff --git a/recipes-qt/qt5/qtscript_5.0.2.bb b/recipes-qt/qt5/qtscript_5.0.2.bb deleted file mode 100644 index 9d334ce219..0000000000 --- a/recipes-qt/qt5/qtscript_5.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI[md5sum] = "929db18c2f4f66cb2ba204076f9f0c22" -SRC_URI[sha256sum] = "def1b60e5ff5513cbda27200554fb568ef822e0ee790476facfe3bcf3438598f" diff --git a/recipes-qt/qt5/qtsvg_5.0.2.bb b/recipes-qt/qt5/qtsvg_5.0.2.bb deleted file mode 100644 index 6f6706f74c..0000000000 --- a/recipes-qt/qt5/qtsvg_5.0.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE files are missing in 5.0.2 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ - file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -" - -PR = "r1" - -SRC_URI[md5sum] = "a000016afd3672540b2488c2f8e8d8b3" -SRC_URI[sha256sum] = "5983485ade365a9e809d4614cc76fb106c35d5c514e0312a9013bb25227a6521" diff --git a/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch deleted file mode 100644 index c5abceee03..0000000000 --- a/recipes-qt/qt5/qttools-5.0.2/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ /dev/null @@ -1,127 +0,0 @@ -From f5d7b5cd073eb6b5a60658b9622c59a682fd828d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert - -This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native -is built without GUI support (no-png is set) and we still want to build -native lrelease + lupdate + lconvert tools. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - examples/examples.pro | 4 ++-- - src/designer/src/src.pro | 14 ++++++++------ - src/linguist/linguist.pro | 2 +- - src/src.pro | 10 ++++++---- - tests/auto/auto.pro | 20 +++++++++++--------- - 5 files changed, 28 insertions(+), 22 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 4955969..8e86419 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -1,3 +1,3 @@ - TEMPLATE = subdirs --qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant -- -+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant -+qtHaveModule(widgets): SUBDIRS += linguist uitools -diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro -index 64d1c37..6e6912d 100644 ---- a/src/designer/src/src.pro -+++ b/src/designer/src/src.pro -@@ -1,10 +1,12 @@ - TEMPLATE = subdirs - CONFIG += ordered - --SUBDIRS = \ -- uitools \ -- lib \ -- components \ -- designer -+!linguistonly { -+ SUBDIRS = \ -+ lib \ -+ components \ -+ designer -+} -+SUBDIRS += uitools - --contains(QT_CONFIG, shared): SUBDIRS += plugins -+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins -diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro -index 04b0ab6..8c63bb4 100644 ---- a/src/linguist/linguist.pro -+++ b/src/linguist/linguist.pro -@@ -3,7 +3,7 @@ SUBDIRS = \ - lrelease \ - lupdate \ - lconvert --!no-png:qtHaveModule(widgets): SUBDIRS += linguist -+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist - - win32:CMAKE_BIN_SUFFIX = ".exe" - -diff --git a/src/src.pro b/src/src.pro -index 3799567..7deb785 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -5,10 +5,12 @@ qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { -- SUBDIRS = assistant \ -+ !linguistonly { -+ SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ -- designer -+ qtestlib -+ } -+ SUBDIRS += designer - # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - } - } -@@ -21,7 +23,7 @@ mac { - - embedded:SUBDIRS += kmap2qmap - --qtHaveModule(dbus): SUBDIRS += qdbus -+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus - # We don't need these command line utilities on embedded platforms. - embedded: SUBDIRS += makeqpf - -diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index 074aa34..d38e05d 100644 ---- a/tests/auto/auto.pro -+++ b/tests/auto/auto.pro -@@ -1,13 +1,15 @@ - TEMPLATE=subdirs --SUBDIRS=\ -- linguist \ -- host.pro \ -- qhelpcontentmodel \ -- qhelpenginecore \ -- qhelpgenerator \ -- qhelpindexmodel \ -- qhelpprojectdata \ -- cmake -+!linguistonly { -+ SUBDIRS=\ -+ linguist \ -+ host.pro \ -+ qhelpcontentmodel \ -+ qhelpenginecore \ -+ qhelpgenerator \ -+ qhelpindexmodel \ -+ qhelpprojectdata \ -+ cmake -+} - - # These tests don't make sense for cross-compiled builds - cross_compile:SUBDIRS -= host.pro --- -1.7.10.4 - diff --git a/recipes-qt/qt5/qttools-native_5.0.2.bb b/recipes-qt/qt5/qttools-native_5.0.2.bb deleted file mode 100644 index 2ce7167946..0000000000 --- a/recipes-qt/qt5/qttools-native_5.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "93ddcfdb87c6a784b0a921d09eafbdad" -SRC_URI[sha256sum] = "bb9bcf38dbb429cf884d688793681257876f97a2c0fba08528393a39eec7755b" diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch deleted file mode 100644 index 0571ea5e83..0000000000 --- a/recipes-qt/qt5/qtwayland-5.1.0+git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 19 Feb 2013 11:16:05 -0800 -Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency - -Not all platforms that use qtwayland depend on xcbcommon to be present -for them to be functional - -This change won't be needed when this commit from dev branch is merged -to stable: -commit 894adf8a447865119be7c6c4d01577d8032f4177 -Author: Oswald Buddenhagen -Date: Mon Apr 8 12:54:58 2013 +0200 - -make failure to configure wayland non-fatal for a top-level build of qt - -Signed-off-by: Martin Jansa ---- - qtwayland.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtwayland.pro b/qtwayland.pro -index 24e104b..66dd38a 100644 ---- a/qtwayland.pro -+++ b/qtwayland.pro -@@ -11,7 +11,7 @@ qtCompileTest(xcomposite) - load(qt_parts) - - !config_wayland { -- error(QtWayland requires Wayland 1.0.3 or higher) -+ error("QtWayland requires Wayland 1.0.3 or higher") - } - - !config_xkbcommon { -@@ -19,7 +19,7 @@ load(qt_parts) - } - - !config_wayland_scanner { -- error(QtWayland requires wayland-scanner) -+ error("QtWayland requires wayland-scanner") - } - - !config_wayland_egl { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch deleted file mode 100644 index 771729086f..0000000000 --- a/recipes-qt/qt5/qtwayland-5.1.0+git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Fri, 1 Mar 2013 13:00:53 -0800 -Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have - qtHaveModule - -Signed-off-by: Martin Jansa ---- - src/compositor/compositor_api/compositor_api.pri | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri -index f0bbe76..e7905e5 100644 ---- a/src/compositor/compositor_api/compositor_api.pri -+++ b/src/compositor/compositor_api/compositor_api.pri -@@ -12,7 +12,7 @@ SOURCES += \ - - QT += core-private - --qtHaveModule(quick) { -+#qtHaveModule(quick) { - SOURCES += \ - compositor_api/qwaylandsurfaceitem.cpp \ - compositor_api/qwaylandsurfacenode.cpp \ -@@ -27,4 +27,4 @@ qtHaveModule(quick) { - - QT += qml quick - QT += quick-private gui-private --} -+#} --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch deleted file mode 100644 index 58f82663f2..0000000000 --- a/recipes-qt/qt5/qtwayland-5.1.0+git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Wed, 6 Mar 2013 10:18:49 -0800 -Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL - -As per the EGL spec the context passed to that function should -be null. - -Signed-off-by: Martin Jansa ---- - .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- - 1 file changed, 2 insertions(+), 14 deletions(-) - -diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -index 73877c4..16e77fb 100644 ---- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -+++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -@@ -101,7 +101,6 @@ public: - - PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; - -- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; - }; - - WaylandEglIntegration::WaylandEglIntegration() -@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); - if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) - { -- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); -- if (!d->get_egl_context) { -- qWarning("Failed to retrieve the get_egl_context function"); -- } - d->egl_bind_wayland_display = - reinterpret_cast(eglGetProcAddress("eglBindWaylandDisplayWL")); - d->egl_unbind_wayland_display = -@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - reinterpret_cast(eglGetProcAddress("glEGLImageTargetTexture2DOES")); - - if (d->egl_bind_wayland_display -- && d->get_egl_context - && d->egl_unbind_wayland_display - && d->egl_create_image - && d->egl_destroy_image -@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL - return 0; - } - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - -@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC - { - Q_D(const WaylandEglIntegration); - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - return image; --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch index e9e705cde6..0571ea5e83 100644 --- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +++ b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch @@ -1,33 +1,38 @@ -From c8417a2b0b66c26eaa0569c19422f87598e29629 Mon Sep 17 00:00:00 2001 +From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 19 Feb 2013 11:16:05 -0800 -Subject: [PATCH 1/4] xcbcommon should not be a mandatory dependency +Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency Not all platforms that use qtwayland depend on xcbcommon to be present for them to be functional -Change-Id: I899d9314bdf772a9d5b8b7c143636f9f12c8ad1d +This change won't be needed when this commit from dev branch is merged +to stable: +commit 894adf8a447865119be7c6c4d01577d8032f4177 +Author: Oswald Buddenhagen +Date: Mon Apr 8 12:54:58 2013 +0200 + +make failure to configure wayland non-fatal for a top-level build of qt Signed-off-by: Martin Jansa --- - qtwayland.pro | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + qtwayland.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qtwayland.pro b/qtwayland.pro -index ee0e5ac..f1a6b6f 100644 +index 24e104b..66dd38a 100644 --- a/qtwayland.pro +++ b/qtwayland.pro -@@ -11,15 +11,15 @@ qtCompileTest(xcomposite) +@@ -11,7 +11,7 @@ qtCompileTest(xcomposite) load(qt_parts) !config_wayland { -- error(QtWayland requires Wayland 1.0.0 or higher) -+ error("QtWayland requires Wayland 1.0.0 or higher") +- error(QtWayland requires Wayland 1.0.3 or higher) ++ error("QtWayland requires Wayland 1.0.3 or higher") } !config_xkbcommon { -- error(QtWayland requires xkbcommon 0.2.0 or higher) -+ warning("No xkbcommon 0.2.0 or higher found, disabling support for it") +@@ -19,7 +19,7 @@ load(qt_parts) } !config_wayland_scanner { diff --git a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch index 0c9bbbe753..771729086f 100644 --- a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch +++ b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch @@ -1,7 +1,7 @@ -From ae72fc41609c15293b1027ca3f2c4d712e4ae478 Mon Sep 17 00:00:00 2001 +From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 1 Mar 2013 13:00:53 -0800 -Subject: [PATCH 2/4] Temporarily patching this out as Qt5.0.0 does not have +Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have qtHaveModule Signed-off-by: Martin Jansa diff --git a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch index 48eb870bcb..58f82663f2 100644 --- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch +++ b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch @@ -1,7 +1,7 @@ -From ca1f46a6192061e254deca1810d25ba423acb8de Mon Sep 17 00:00:00 2001 +From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Wed, 6 Mar 2013 10:18:49 -0800 -Subject: [PATCH 3/4] eglCreateImageKHR requires the context to be NULL +Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL As per the EGL spec the context passed to that function should be null. @@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -index 2a923ce..2be1e4c 100644 +index 73877c4..16e77fb 100644 --- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp @@ -101,7 +101,6 @@ public: diff --git a/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch b/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch deleted file mode 100644 index 47ea65fde5..0000000000 --- a/recipes-qt/qt5/qtwayland-git/0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5c70644070803b665f64c2d3212b55a4a3270765 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Sun, 10 Mar 2013 11:29:38 -0700 -Subject: [PATCH 4/4] EGL: Specify vec2d precision qualifier in fragment shader - -GLSL does not specify a default precision qualifier here, so we have to -explicitly define it. Use highp, as it gets redefined to mediump by -QGLShaderProgram when not available. - -Signed-off-by: Daniel Stone -Signed-off-by: Martin Jansa ---- - src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp -index 4d8017d..a0ac6d9 100644 ---- a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp -+++ b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.cpp -@@ -124,7 +124,7 @@ void QWaylandGLContext::swapBuffers(QPlatformSurface *surface) - gl_Position = position;\n\ - outTexCoords = texCoords.xy;\n\ - }"); -- m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying vec2 outTexCoords;\n\ -+ m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying highp vec2 outTexCoords;\n\ - uniform sampler2D texture;\n\ - void main()\n\ - {\n\ --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 40dd803ad6..158022357b 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod # make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't # have libxkbcommon in oe-core). XKB_DEPENDS = "libxkbcommon xproto" -DEPENDS += "qtbase qtdeclarative wayland wayland-native ${XKB_DEPENDS}" +DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}" SRC_URI += " \ file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ diff --git a/recipes-qt/qt5/qtwayland_5.1.0+git.bb b/recipes-qt/qt5/qtwayland_5.1.0+git.bb deleted file mode 100644 index 31ed85c349..0000000000 --- a/recipes-qt/qt5/qtwayland_5.1.0+git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require qt5-git.inc -require ${PN}.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-5.1.0+git:" - -DEPENDS += "qtwayland-native" - -# qtwayland_git has -1 and should be default -DEFAULT_PREFERRENCE = "-2" - -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 -# while qtwayland_git stays compatible with 5.0.2 -PV = "5.1.0+git${SRCPV}" - -# newer revisions depend on newer wayland-1.1 APIs -SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3" -# SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 170b3673ec..ca7f3de117 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,22 +1,10 @@ require qt5-git.inc require ${PN}.inc -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1, -# but we'll use 5.0.2+git to indicate this version is compatible with 5.0.2 -PV = "5.0.2+git${SRCPV}" +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 +PV = "5.1.0+git${SRCPV}" -# drop when bumping SRCREV -PR = "r2" - -SRCREV = "5cb159395eccb1d96fb73a78e499eef30aacb46d" - -SRC_URI += " \ - file://0004-EGL-Specify-vec2d-precision-qualifier-in-fragment-sh.patch \ -" - -do_configure_prepend() { - # Temporary hack to get qtwayland build for Qt 5.0.2 - if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then - echo "MODULE_VERSION = 0.0.0" >> ${S}/.qmake.conf - fi -} +# newer revisions depend on newer wayland-1.1 APIs +SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3" +# SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb b/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb deleted file mode 100644 index 42a2264bf0..0000000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# was renamed to just qtwebkit-examples in 5.1 -QT_MODULE = "qtwebkit-examples-and-demos" - -SRC_URI[md5sum] = "9c48df80ba9bb3587b4d6ec35daf840a" -SRC_URI[sha256sum] = "10981ae3a6775387badce33542733d63895c5a62b3b33e0973d782ec1b9174e6" diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb deleted file mode 100644 index ab1cacd5c1..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -PR = "r1" - -SRC_URI[md5sum] = "85aad9f287910c21c8464d7d1ea010a9" -SRC_URI[sha256sum] = "6ff4038f8db68be51661d1a6646f510b26f6ebbecbdeefb76cd8361f808768f6" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb deleted file mode 100644 index 47cdb32000..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -# LICENSE.FDL is missing in 5.0.2, added a bit later: -# commit 3bc0756a63d348d3446d9581f45429c417fd9c29 -# Author: Sergio Ahumada -# Date: Thu Apr 18 11:38:32 2013 +0200 -# Add missing LICENSE.FDL file -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ -" - -PR = "r1" - -SRC_URI[md5sum] = "29e6776165e43e9f3a865338121b4e1d" -SRC_URI[sha256sum] = "c05ae43fffc911ffda808deecebddd1b31916714cefc9cfd840689fc52ae20a6" From f770c5dca9d755ebda51deb1f578f1ec43c68d8b Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Fri, 23 Aug 2013 09:16:05 +0000 Subject: [PATCH 229/347] QtSerialPort: Add 5.1.0 version Signed-off-by: Laszlo Papp Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtserialport.inc | 3 +++ recipes-qt/qt5/qtserialport_5.1.0.bb | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 recipes-qt/qt5/qtserialport.inc create mode 100644 recipes-qt/qt5/qtserialport_5.1.0.bb diff --git a/recipes-qt/qt5/qtserialport.inc b/recipes-qt/qt5/qtserialport.inc new file mode 100644 index 0000000000..bbb05a6557 --- /dev/null +++ b/recipes-qt/qt5/qtserialport.inc @@ -0,0 +1,3 @@ +require qt5.inc + +DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtserialport_5.1.0.bb b/recipes-qt/qt5/qtserialport_5.1.0.bb new file mode 100644 index 0000000000..11b5346027 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.1.0.bb @@ -0,0 +1,10 @@ +require qt5-${PV}.inc +require ${PN}.inc + +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ + file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\ +" + +SRC_URI[md5sum] = "1f70621ae40cbda948106b070c6c37d2" +SRC_URI[sha256sum] = "0f36803c480b2b7111b343e9dd871ffab1b4fd53147bd564125ef2994b09cfb9" From f11b1722e28800c790609d0de9541f6555e1ee5a Mon Sep 17 00:00:00 2001 From: Tasslehoff Kjappfot Date: Thu, 29 Aug 2013 09:53:44 +0200 Subject: [PATCH 230/347] qtquickcontrols: Add module for 5.1.0 and git versions Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 1 + recipes-qt/qt5/qt5.inc | 8 +++++++- recipes-qt/qt5/qtbase.inc | 1 + recipes-qt/qt5/qtquickcontrols.inc | 3 +++ recipes-qt/qt5/qtquickcontrols_5.1.0.bb | 5 +++++ recipes-qt/qt5/qtquickcontrols_git.bb | 4 ++++ 6 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtquickcontrols.inc create mode 100644 recipes-qt/qt5/qtquickcontrols_5.1.0.bb create mode 100644 recipes-qt/qt5/qtquickcontrols_git.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 81cb8cbb51..f534de70a6 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -12,6 +12,7 @@ PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}" PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}" PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" +PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}" PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 80acb73e39..a9d3000cb9 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -39,7 +39,7 @@ FILES_${PN}-plugins-dbg = " \ " # extra packages -# qmlplugins 1-3 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} +# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/qmldir \ @@ -56,6 +56,12 @@ 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_QML}/*/*/*/*/*/*.png \ ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_IMPORTS}/*/*.qmltypes \ diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index e8b240670b..b6927d1a05 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -65,6 +65,7 @@ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[sm] = "-sm,-no-sm" PACKAGECONFIG[tests] = ",-nomake tests" PACKAGECONFIG[examples] = ",-nomake examples" +# accessibility is required to compile qtquickcontrols PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype" diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc new file mode 100644 index 0000000000..63e884eaa6 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols.inc @@ -0,0 +1,3 @@ +require qt5.inc + +DEPENDS += "qtdeclarative" diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.0.bb b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb new file mode 100644 index 0000000000..fc880d75f1 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "b3825124a173a36f63c2f8380dc61e81" +SRC_URI[sha256sum] = "88d39421d78464c3900c37616e8369fc8d998c1b0f611980e6e082f46569646b" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb new file mode 100644 index 0000000000..ded017bd92 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "c304d741a27b5822a35d1fb83f8f5e65719907ce" From 918d5d9671130580bd7f31cc5b69f7be127063ae Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 24 Sep 2013 02:35:11 +0000 Subject: [PATCH 231/347] qtwebkit: fix QA issue (bad RPATH) Building qtwebkit causes a QA issue such that QtWebPluginProcess and QtWebProcess contain bad RPATHs which point into the build location. This fix adds a patch to not include the rpath.prf which causes this problem. Signed-off-by: Trevor Woerner Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 5 +---- recipes-qt/qt5/qtwebkit/fix-rpath.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 recipes-qt/qt5/qtwebkit/fix-rpath.patch diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 75492d58aa..458eb92ae4 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -14,7 +14,4 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " -do_configure_append() { - # Fix rpaths for QtWebProcess - find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" -} +SRC_URI += "file://fix-rpath.patch" diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch new file mode 100644 index 0000000000..5c20514417 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/fix-rpath.patch @@ -0,0 +1,13 @@ +Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf +=================================================================== +--- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf ++++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf +@@ -32,8 +32,6 @@ linux-*g++* { + QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions + } + +-contains(TEMPLATE, app): CONFIG += rpath +- + isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { + # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. + config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory From f4188229f100349f4c88340b62a37d3ebfe51cc5 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 20 Sep 2013 03:16:06 +0000 Subject: [PATCH 232/347] devshell: include PATH for qt5 native applications If you perform a "bitbake -c devshell " and then try "which qmake" in the devshell, you'll find your host's qmake is found (which is most likely to be based on qt4) rather than the one that is built as part of meta-qt5. The reason for this is that the qt5 items are installed to ${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The reason for the extra "qt5" directory at the end is so that qt4-based items that are built in OE can live side-by-side with things from meta-qt5 without interfering with each other. This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH so that the qt5-based native tools which are built as part of meta-qt5 will be found before the host's. Signed-off-by: Trevor Woerner Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a9d3000cb9..f1fd9517f8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -132,3 +132,5 @@ FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ " + +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" From d691c447784646688b3b0445d63359a7d9292926 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sat, 28 Sep 2013 22:25:14 +0000 Subject: [PATCH 233/347] maliit: Import maliit recipes from meta-oe * Imported from rev 13ae5105ee30410136beeae66ec41ee4a8a2e2b0 This is the first step to move these recipes over to qt5. * maliit-framework-qt5: Build with qt5 Switch to new github repo Update SRCREV and remove patches which now longer apply Disable doc generation and xcb Fix packaging * maliit-plugins-qt5: Build with qt5. Switch to new github repo Update SRCREV and PV Fix packaging * maliit-*-qt5: Adjust MKSPEC path * meta-framework-qt5: Cleanup packaging and enable dbus activation. Move pkgconfig files, headers and spec files into dev. Cleanup packaging rules Enable dbus activation to start maliit server on demand * maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host If not overriden here MALIIT_PLUGINS_DATA_DIR would point to some host paths resulting in e.g. qml files not being found. Signed-off-by: Martin Jansa Signed-off-by: Stefan Schmidt --- ...LL_PRF-to-allow-the-build-with-opene.patch | 34 +++++++ ..._PATH-to-allow-openembedded-to-build.patch | 34 +++++++ ...libmaliit-1-0-in-inputcontext-plugin.patch | 23 +++++ .../maliit-server.desktop | 6 ++ recipes-qt/maliit/maliit-framework-qt5_git.bb | 98 +++++++++++++++++++ recipes-qt/maliit/maliit-plugins-qt5_git.bb | 41 ++++++++ 6 files changed, 236 insertions(+) create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch create mode 100644 recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop create mode 100644 recipes-qt/maliit/maliit-framework-qt5_git.bb create mode 100644 recipes-qt/maliit/maliit-plugins-qt5_git.bb diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch new file mode 100644 index 0000000000..acd9a57a57 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch @@ -0,0 +1,34 @@ +From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel +Date: Wed, 1 Aug 2012 13:21:51 +0200 +Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Samuel Stirtzel +--- + config.pri | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/config.pri b/config.pri +index b037b8c..43409f3 100644 +--- a/config.pri ++++ b/config.pri +@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { + QT_WIDGETS = gui widgets + } + +-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features +-local-install { +- MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++isEmpty(MALIIT_INSTALL_PRF) { ++ MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features ++ local-install { ++ MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++ } + } + + defineTest(outputFile) { +-- +1.7.9.5 + diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch new file mode 100644 index 0000000000..830e6deb4e --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch @@ -0,0 +1,34 @@ +From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel +Date: Wed, 1 Aug 2012 13:33:10 +0200 +Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Samuel Stirtzel +--- + input-context/input-context.pri | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/input-context/input-context.pri b/input-context/input-context.pri +index d94e6a3..d460e70 100644 +--- a/input-context/input-context.pri ++++ b/input-context/input-context.pri +@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){ + + QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda + +-QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods +-QT_PREFIX = $$[QT_INSTALL_PREFIX] +-local-install { +- QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX) ++isEmpty(QT_IM_PLUGIN_PATH) { ++ QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods ++ QT_PREFIX = $$[QT_INSTALL_PREFIX] ++ local-install { ++ QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX) ++ } + } +-- +1.7.9.5 + diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch new file mode 100644 index 0000000000..c2291c6b7b --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch @@ -0,0 +1,23 @@ +From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel +Date: Fri, 1 Mar 2013 11:31:41 +0100 +Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin + +Signed-off-by: Samuel Stirtzel +--- + .../input-context-plugin/input-context-plugin.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro +index eefbe93..296e2fa 100644 +--- a/input-context/input-context-plugin/input-context-plugin.pro ++++ b/input-context/input-context-plugin/input-context-plugin.pro +@@ -15,3 +15,5 @@ CONFIG += plugin + + INSTALLS += target + target.path += $$QT_IM_PLUGIN_PATH ++ ++LIBS += -L../../lib -l"maliit-1.0" +-- +1.7.9.5 + diff --git a/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop b/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop new file mode 100644 index 0000000000..24bdf9b525 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Maliit server +Exec=/usr/bin/maliit-server +Icon= +Type=Application +Categories=Utility; diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb new file mode 100644 index 0000000000..ccd0c4cbbf --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -0,0 +1,98 @@ +DESCRIPTION = "A virtual keyboard for touch-screen based user interfaces" +HOMEPAGE = "https://wiki.maliit.org/Main_Page" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad" + +inherit qmake5 + +# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir} +# but +# actually it is ${includedir}/qt5 +OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" + + +SRC_URI = "git://github.com/maliit/framework.git;branch=master \ + file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ + file://maliit-server.desktop \ +" + +SRCREV = "dbc0403f329d7f6ce2f5a09e6ff5adbd2548a8c9" +PV = "0.99.0+git${SRCPV}" + + +PACKAGES =+ "${PN}-gtk" +GTKIMMODULES_PACKAGES = "${PN}-gtk" + +# FIXME: Do we need something like this with qt5? +#RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4" + +RRECOMMENDS_${PN} = "maliit-plugins-qt5" + +FILES_${PN} += "\ + ${libdir}/*.so* \ + ${bindir} \ + ${datadir}/applications/maliit-server.desktop \ + ${datadir}/dbus-1 \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/maliit-framework-tests \ +" + +FILES_${PN}-dev += "\ + ${includedir}/maliit \ + ${libdir}/pkgconfig \ + ${libdir}/qt5 \ +" + +EXTRA_QMAKEVARS_PRE = "\ + PREFIX=${prefix} \ + LIBDIR=${libdir} \ + QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \ + MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \ + SCHEMADIR=${sysconfdir}/gconf/schemas \ + CONFIG+=disable-gconf \ + CONFIG+=disable-gtk-cache-update \ + CONFIG+=local-install \ + CONFIG+=nosdk \ + CONFIG+=nodoc \ + CONFIG+=noxcb \ + CONFIG+=enable-dbus-activation \ +" + +EXTRA_OEMAKE += "INSTALL_ROOT=${D}" + +do_install_append() { + #Fix absolute paths + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-defines.prf + + install -d ${D}${datadir}/applications + install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications +} + +pkg_postinst_${PN} () { +#!/bin/sh +# should run online +if [ "x$D" != "x" ]; then + exit 1 +fi +echo "export QT_IM_MODULE=Maliit" >> /etc/xprofile +ln -s /usr/share/applications/maliit-server.desktop /etc/xdg/autostart/maliit-server.desktop +} + +pkg_postrm_${PN} () { +#!/bin/sh +# should run online +if [ "x$D" = "x" ]; then + exit 1 +fi +if [ -e "/etc/xprofile" ]; then + sed -i -e "g|export QT_IM_MODULE=Maliit|d" /etc/xprofile +fi +rm -f /etc/xdg/autostart/maliit-server.desktop +} + +S = "${WORKDIR}/git" diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb new file mode 100644 index 0000000000..fa3d1fd6d4 --- /dev/null +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Plugins for a virtual keyboard for touch-screen based user interfaces" +HOMEPAGE = "https://wiki.maliit.org/Main_Page" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621" + +inherit qmake5 + +# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir} +# but +# actually it is ${includedir}/qt5 +OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" + +DEPENDS = "maliit-framework-qt5" + +# FIXME: Do we need something like this with qt5? +#RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg" + +SRC_URI = "git://github.com/maliit/plugins.git;branch=master" + +SRCREV = "c6a348592607248a771a3dde5a0e33dc3c433a2a" +PV = "0.99.0+git${SRCPV}" + +EXTRA_QMAKEVARS_PRE = "\ + PREFIX=${prefix} \ + MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \ + MALIIT_PLUGINS_DATA_DIR=${datadir} \ + LIBDIR=${libdir} \ + CONFIG+=nodoc \ +" + +FILES_${PN} += "\ + ${libdir}/maliit \ + ${datadir} \ +" + +FILES_${PN}-dbg += "${libdir}/maliit/plugins/.debug" + +S= "${WORKDIR}/git" + +EXTRA_OEMAKE += "INSTALL_ROOT=${D}" From d6fc754ac4145b0edf0d4bb62af1018d67ad1b64 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 4 Oct 2013 16:52:17 +0200 Subject: [PATCH 234/347] qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby * when ruby-native is reused from sstate it can contain paths pointing to wrong sysroot Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 458eb92ae4..c0e0648097 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -15,3 +15,9 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " SRC_URI += "file://fix-rpath.patch" + +# make sure rb files are used from sysroot, not from host +# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` +# we need to replace it too (a bit longer version without importing re) +RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" +export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" From d43d777816cf7270e99bfdebd7660e7a07145895 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 4 Oct 2013 19:40:46 +0200 Subject: [PATCH 235/347] README: Add note about qtbase PACKAGECONFIG options Signed-off-by: Martin Jansa --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index e86ba0a2b9..a5a5812845 100644 --- a/README +++ b/README @@ -9,6 +9,10 @@ layers: meta-ruby branch: master revision: HEAD +When building stuff like qtdeclarative, qtquick, qtwebkit, make sure that +you have required PACKAGECONFIG options enabled in qtbase build, see qtbase.inc +for detail. + Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5]' in the subject' When sending single patches, please using something like: From 149e6b6d3730a1ff5431cdfedd2c6dbc623362b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sun, 6 Oct 2013 20:49:06 +0200 Subject: [PATCH 236/347] cinematicexperience: add example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for more informations on this demo : http://kgronholm.blogspot.fr/2012/08/qt5-cinematic-experience.html http://quitcoding.com/?page=work#cinex Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../examples/cinematicexperience_1.0.bb | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-qt/examples/cinematicexperience_1.0.bb diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb new file mode 100644 index 0000000000..9ee5532342 --- /dev/null +++ b/recipes-qt/examples/cinematicexperience_1.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Qt5 technology demo" +DESCRIPTION = "Cinematic Experience collects many of the new Qt5 QtQuick 2.0 features into the same UX demo application. It uses particles, sprites, path animation, custom shaders etc. features which Qt5 introduces for QML UIs." +HOMEPAGE = "http://quitcoding.com/?page=work#cinex" +LICENSE = "CC-BY-3.0" +LIC_FILES_CHKSUM = "file://README;beginline=38;endline=50;md5=51babd597624b70752069953876aaa18" + +SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_rpi_1.0.tgz" + +SRC_URI[md5sum] = "935a5db0a6b2a72c67236e72f52be7d1" +SRC_URI[sha256sum] = "0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b" + +S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/" + +# other version available for small screens +#SRC_URI = "http://quitcoding.com/download/Qt5_CinematicExperience_1.0.tgz" +#SRC_URI[md5sum] = "1c4f9bf5411c985fc5d3dbfc5d826a29" +#SRC_URI[sha256sum] = "0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44" +#S = "${WORKDIR}/Qt5_CinematicExperience_${PV}/" + +DEPENDS = "qtdeclarative qtgraphicaleffects" +RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" + +require recipes-qt/qt5/qt5.inc + +do_install() { + install -d ${D}${datadir}/${P} + install -m 0755 ${B}/Qt5_CinematicExperience ${D}${datadir}/${P} + cp -a ${S}/content ${D}${datadir}/${P} + install -m 0644 ${S}/Qt5_CinematicExperience.qml ${D}${datadir}/${P} + + install -d ${D}${bindir} + echo "#!/bin/sh" > ${D}${bindir}/Qt5_CinematicExperience + echo "export QML_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "export QML2_IMPORT_PATH=${datadir}/${P}" >> ${D}${bindir}/Qt5_CinematicExperience + echo "${datadir}/${P}/Qt5_CinematicExperience \$* " >> ${D}${bindir}/Qt5_CinematicExperience + chmod +x ${D}${bindir}/Qt5_CinematicExperience +} + +FILES_${PN}-dbg += "${datadir}/${P}/.debug" +FILES_${PN} += "${datadir}" From 105ad2a18e20f2b07d20a1640917e69950c8496b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:54:12 +0200 Subject: [PATCH 237/347] qtbase: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - patch 10 was update - patch 19 & 25 are merged so no more needed Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../qt5/{qt5-5.1.0.inc => qt5-5.1.1.inc} | 0 ...wayland-scanner-disable-silent-rules.patch | 82 ------------------- ...estoring-in-QOpenGLTextureGlyphCache.patch | 49 ----------- ...ix-data-corruption-in-readData-metho.patch | 41 ---------- .../0001-Add-linux-oe-g-platform.patch | 22 ++--- .../0001-Always-build-uic.patch | 6 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 8 +- .../0003-Add-external-hostbindir-option.patch | 51 ++++++------ ...tions-temporary-remove-isEmpty-check.patch | 10 +-- ...ke-is-already-built-in-qtbase-native.patch | 10 +-- ...ding-a-separate-qmake-for-the-target.patch | 10 +-- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 10 +-- ...-qt_module-Fix-pkgconfig-replacement.patch | 8 +- ...09-qt_module-Fix-paths-in-.prl-files.patch | 8 +- ...wayland-scanner-disable-silent-rules.patch | 82 +++++++++++++++++++ ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 10 +-- ...Allow-to-add-extra-arguments-to-make.patch | 6 +- .../0013-Disable-mkv8snapshot.patch | 12 +-- ...-device-to-be-read-from-env-variable.patch | 6 +- .../0015-qtbase-allow-build-of-examples.patch | 6 +- ...-QOpenGLPaintDevice-sub-area-support.patch | 22 ++--- ...20-Use-BGRA-extension-in-bindTexture.patch | 6 +- ...ake-pulseaudio-a-configurable-option.patch | 10 +-- ...gure-make-alsa-a-configurable-option.patch | 10 +-- ...-make-freetype-a-configurable-option.patch | 10 +-- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 14 ++-- ...native_5.1.0.bb => qtbase-native_5.1.1.bb} | 4 +- recipes-qt/qt5/qtbase.inc | 1 - recipes-qt/qt5/qtbase_5.1.0.bb | 9 -- recipes-qt/qt5/qtbase_5.1.1.bb | 5 ++ 30 files changed, 217 insertions(+), 311 deletions(-) rename recipes-qt/qt5/{qt5-5.1.0.inc => qt5-5.1.1.inc} (100%) delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0001-Add-linux-oe-g-platform.patch (95%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0001-Always-build-uic.patch (91%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (87%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0003-Add-external-hostbindir-option.patch (79%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0004-qt_functions-temporary-remove-isEmpty-check.patch (90%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0005-qmake-is-already-built-in-qtbase-native.patch (74%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0006-Allow-building-a-separate-qmake-for-the-target.patch (74%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch (84%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0008-qt_module-Fix-pkgconfig-replacement.patch (94%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0009-qt_module-Fix-paths-in-.prl-files.patch (93%) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch (85%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch (91%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0013-Disable-mkv8snapshot.patch (86%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0014-enables-tslib-device-to-be-read-from-env-variable.patch (89%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0015-qtbase-allow-build-of-examples.patch (92%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0018-QOpenGLPaintDevice-sub-area-support.patch (89%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0020-Use-BGRA-extension-in-bindTexture.patch (90%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0021-configure-make-pulseaudio-a-configurable-option.patch (78%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0022-configure-make-alsa-a-configurable-option.patch (76%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0023-configure-make-freetype-a-configurable-option.patch (77%) rename recipes-qt/qt5/{qtbase-5.1.0 => qtbase-5.1.1}/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch (93%) rename recipes-qt/qt5/{qtbase-native_5.1.0.bb => qtbase-native_5.1.1.bb} (64%) delete mode 100644 recipes-qt/qt5/qtbase_5.1.0.bb create mode 100644 recipes-qt/qt5/qtbase_5.1.1.bb diff --git a/recipes-qt/qt5/qt5-5.1.0.inc b/recipes-qt/qt5/qt5-5.1.1.inc similarity index 100% rename from recipes-qt/qt5/qt5-5.1.0.inc rename to recipes-qt/qt5/qt5-5.1.1.inc diff --git a/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index bdbb52a1d9..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.0/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c441038a17c1173c8abafd451c4083b2eccc54ab Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/23] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 2ec064f..847d0f7 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES - wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES - wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES - wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code - - qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) -@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS - qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands -+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-header - - qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES - qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp - qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands -+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-code - - qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} -@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS - qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands -+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-header - - qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES - qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp - qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands -+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-code --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch deleted file mode 100644 index c3a9dd5449..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.0/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7c4453b5203e908f0c851c2a34231d81eb2f73c2 Mon Sep 17 00:00:00 2001 -From: Valery Volgutov -Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH 19/23] Fix FBO restoring in QOpenGLTextureGlyphCache - -QOpenGLTextureGlyphCache::restoreTextureData restores FBO which -was binded before restoreTextureData call. More specifically, -it restores QOpenGLContextPrivate's current_fbo member. This works -if FBO was binded by QOpenGLFramebufferObject but not if FBO was -binded using glBindFramebufferObject and rendering done via -QOpenGLPaintDevice. - -This patch fixes it by querying current FBO using -GL_FRAMEBUFFER_BINDING query and restoring it. - -Upstream-Status: Backport -https://codereview.qt-project.org/#change,56608 - -Signed-off-by: Martin Jansa ---- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index ec29900..9bda1db 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - return; - } - -+ GLuint saveFbo; -+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); -+ - int oldWidth = m_textureResource->m_width; - int oldHeight = m_textureResource->m_height; - -@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - glDeleteTextures(1, &tmp_texture); - glDeleteTextures(1, &oldTexture); - -- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); -+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); - - if (pex != 0) { - glViewport(pex->x, pex->y, pex->width, pex->height); --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index 6858cead49..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.0/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af96c6fed931564c95037539f07e9c8e33c69529 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,61698] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-32534 -Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 -Reviewed-by: Jonathan Liu -Reviewed-by: Shane Kearns ---- - src/network/access/qhttpmultipart.cpp | 3 +- - .../access/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 4397ef8..5985ed9 100644 ---- a/src/network/access/qhttpmultipart.cpp -+++ b/src/network/access/qhttpmultipart.cpp -@@ -497,7 +497,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-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch similarity index 95% rename from recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch rename to recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch index 669dffcd60..87c2612258 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 7244ed3ca9326f3521de8961dbe7f9759f8e8041 Mon Sep 17 00:00:00 2001 +From b91e232e603df102a1d305aceb0dbedc6ce3e89c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/23] Add linux-oe-g++ platform +Subject: [PATCH 01/22] 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 @@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index d7c9674..45e0586 100755 +index 140c7b4..397d53f 100755 --- a/configure +++ b/configure -@@ -284,6 +284,16 @@ getQMakeConf() +@@ -291,6 +291,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -61,7 +61,7 @@ index d7c9674..45e0586 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -293,6 +303,16 @@ getXQMakeConf() +@@ -300,6 +310,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -78,7 +78,7 @@ index d7c9674..45e0586 100755 compilerSupportsFlag() { cat >conftest.cpp <> "$mkfile" } @@ -130,7 +130,7 @@ index d7c9674..45e0586 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3947,11 +3987,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3997,11 +4037,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch similarity index 91% rename from recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch rename to recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch index 5f37a971d6..96c85f05d2 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0001-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch @@ -1,7 +1,7 @@ -From 28cb656a49b80364f4bfc4387849f1e9ac56fbf2 Mon Sep 17 00:00:00 2001 +From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] Always build uic +Subject: [PATCH 22/22] 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. @@ -36,5 +36,5 @@ index b4c9602..f30ec1f 100644 nacl: SUBDIRS -= src_network src_testlib -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch similarity index 87% rename from recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch rename to recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index c9c663a3d7..fab5880222 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 6eb6d141309bc5a42218fbc755545ead70a88b55 Mon Sep 17 00:00:00 2001 +From a899fba459928c7e5196f15dcea4d561807dc825 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/22] 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 @@ -16,7 +16,7 @@ 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 1eaebe5..bda2ffe 100644 +index 53a3ebb..8ca2102 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -32,5 +32,5 @@ index 1eaebe5..bda2ffe 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch similarity index 79% rename from recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch rename to recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch index 751275ed41..b4bf10f651 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ -From 253db5565b402dfc0b2abbcc813d6ac32eecef96 Mon Sep 17 00:00:00 2001 +From 062621e0310eddb448ebcc27fc4c1507c2d6e30d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/23] Add -external-hostbindir option +Subject: [PATCH 03/22] 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 @@ -12,7 +12,7 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa --- - configure | 15 ++++++++++++++- + configure | 16 +++++++++++++++- mkspecs/features/qt_functions.prf | 5 ++++- mkspecs/features/qt_tool.prf | 2 +- qmake/property.cpp | 1 + @@ -20,13 +20,13 @@ Signed-off-by: Martin Jansa src/corelib/global/qlibraryinfo.cpp | 3 ++- src/corelib/global/qlibraryinfo.h | 1 + tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 40 insertions(+), 7 deletions(-) + 8 files changed, 41 insertions(+), 7 deletions(-) diff --git a/configure b/configure -index 45e0586..dbe7360 100755 +index 397d53f..80bdd7a 100755 --- a/configure +++ b/configure -@@ -1038,6 +1038,7 @@ QT_HOST_PREFIX= +@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= @@ -34,16 +34,17 @@ index 45e0586..dbe7360 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -1145,7 +1146,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style options that pass an argument -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) +@@ -1191,7 +1192,8 @@ while [ "$#" -gt 0 ]; do + -android-ndk-platform| \ + -android-ndk-host| \ + -android-arch| \ +- -android-toolchain-version) ++ -android-toolchain-version| \ ++ -external-hostbindir) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1333,6 +1334,9 @@ while [ "$#" -gt 0 ]; do +@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do hostlibdir) QT_HOST_LIBS="$VAL" ;; @@ -53,7 +54,7 @@ index 45e0586..dbe7360 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -3190,6 +3194,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then +@@ -3240,6 +3245,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi @@ -65,7 +66,7 @@ index 45e0586..dbe7360 100755 #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please #------------------------------------------------------------------------------- -@@ -3358,6 +3367,9 @@ Installation options: +@@ -3408,6 +3418,9 @@ Installation options: -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -75,7 +76,7 @@ index 45e0586..dbe7360 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3873,6 +3885,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3923,6 +3936,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", @@ -84,10 +85,10 @@ index 45e0586..dbe7360 100755 "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index bbbb5d3..d581367 100644 +index 2f2c94c..4e12d3d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { +@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { @@ -125,10 +126,10 @@ index 4685440..93eb1d4 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index 6ab032e..38872b6 100644 +index d6726b5..28ca7d5 100644 --- a/qtbase.pro +++ b/qtbase.pro -@@ -68,16 +68,22 @@ CONFIG -= qt +@@ -70,16 +70,22 @@ CONFIG -= qt #qmake qmake.path = $$[QT_HOST_BINS] @@ -155,7 +156,7 @@ index 6ab032e..38872b6 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index bda2ffe..530aea9 100644 +index 8ca2102..9f5d444 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() @@ -188,10 +189,10 @@ index b275e01..0e6baed 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index f92fad1..8f0bd0e 100644 +index a6376bb..aed85ce 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1161,6 +1161,13 @@ void Configure::parseCmdLine() +@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); } @@ -205,7 +206,7 @@ index f92fad1..8f0bd0e 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3752,6 +3759,7 @@ void Configure::generateQConfigCpp() +@@ -3708,6 +3715,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl @@ -214,5 +215,5 @@ index f92fad1..8f0bd0e 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch similarity index 90% rename from recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch rename to recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch index 4fe10871bb..955d791cf3 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ -From ad252e21f737536027aebbf63217188a80d108ba Mon Sep 17 00:00:00 2001 +From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/22] 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 - @@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index d581367..2bc6533 100644 +index 4e12d3d..e20ad9d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 @@ -47,5 +47,5 @@ index 83ef3a0..21c9eb7 100644 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch similarity index 74% rename from recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch rename to recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch index 69b1435811..1f5b62dc88 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From bd7521ebc01feedde14e3e5e037ebd66b994db06 Mon Sep 17 00:00:00 2001 +From 777d4bfc7a94256ec46f61bd80bc6058cdf55ebb Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/23] qmake is already built in qtbase-native +Subject: [PATCH 05/22] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index dbe7360..f8f0e9a 100755 +index 39a5deb..40f2b02 100755 --- a/configure +++ b/configure -@@ -3963,7 +3963,7 @@ setBootstrapEvalVariable() +@@ -4014,7 +4014,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index dbe7360..f8f0e9a 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch similarity index 74% rename from recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch index 363a8ee944..56b0fdd453 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From 00997b0cf46d6b6c362c48ee31f886c553a3fb4f Mon Sep 17 00:00:00 2001 +From c36477f621c7d682ee7140156127ad32e91a40ad Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/23] Allow building a separate qmake for the target +Subject: [PATCH 06/22] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 +index a81d0cd..ed7aebf 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic +@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ PROEVALUATOR_FULL PROEVALUATOR_DEBUG DESTDIR = ../bin/ @@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch similarity index 84% rename from recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch rename to recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 97b1269c3f..00affb1204 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ -From 662115f5e837fc397533810ca659af0f66749ce4 Mon Sep 17 00:00:00 2001 +From c2cc1f9251953f680191c5cf53b019d5d480c79e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 8f0bd0e..f7ff15c 100644 +index aed85ce..0575520 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() +@@ -3111,8 +3111,8 @@ void Configure::generateQConfigPri() configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection @@ -25,5 +25,5 @@ index 8f0bd0e..f7ff15c 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch similarity index 94% rename from recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch rename to recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch index 2de710372f..dfc018f2c6 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 1db1ad1ef3c57f531bf67be33a4cc43528864543 Mon Sep 17 00:00:00 2001 +From 0089c1ecba912aed6a8cd6126297300e0f7ffcb9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -27,7 +27,7 @@ Signed-off-by: Martin Jansa 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 53a5499..9dfc1dd 100644 +index 390fb49..e85c2a8 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -140,18 +140,30 @@ unix|win32-g++* { @@ -66,5 +66,5 @@ index 53a5499..9dfc1dd 100644 unix|win32-g++* { -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch similarity index 93% rename from recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch rename to recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch index f9e6c64ecc..5c8f81890d 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 036a2be171a0bf6fea5eaa7383e19f2559a37dce Mon Sep 17 00:00:00 2001 +From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/23] qt_module: Fix paths in .prl files +Subject: [PATCH 09/22] 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 @@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 9dfc1dd..5cedb8f 100644 +index e85c2a8..7fcfcfe 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -144,17 +144,23 @@ unix|win32-g++* { @@ -58,5 +58,5 @@ index 9dfc1dd..5cedb8f 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 0000000000..a91c9edf58 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,82 @@ +From 9a2219a25247b76de6524d358211b55467305d11 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 10/22] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index b2eca41..46da374 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland_server_header.input = WAYLANDSERVERSOURCES + wayland_server_header.variable_out = HEADERS + wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands ++#silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands + QMAKE_EXTRA_COMPILERS += wayland_server_header + + wayland_client_header.name = wayland ${QMAKE_FILE_BASE} +@@ -18,7 +18,7 @@ wayland_client_header.input = WAYLANDCLIENTSOURCES + wayland_client_header.variable_out = HEADERS + wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands ++#silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands + QMAKE_EXTRA_COMPILERS += wayland_client_header + + wayland_code.name = wayland ${QMAKE_FILE_BASE} +@@ -26,7 +26,7 @@ wayland_code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES + wayland_code.variable_out = SOURCES + wayland_code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland_code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands ++#silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands + QMAKE_EXTRA_COMPILERS += wayland_code + + qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) +@@ -37,7 +37,7 @@ qtwayland_client_header.variable_out = HEADERS + qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands ++#silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands + QMAKE_EXTRA_COMPILERS += qtwayland_client_header + + qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -46,7 +46,7 @@ qtwayland_client_code.variable_out = SOURCES + qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp + qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands ++#silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands + QMAKE_EXTRA_COMPILERS += qtwayland_client_code + + qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE} +@@ -55,7 +55,7 @@ qtwayland_server_header.variable_out = HEADERS + qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands ++#silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands + QMAKE_EXTRA_COMPILERS += qtwayland_server_header + + qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -64,5 +64,5 @@ qtwayland_server_code.variable_out = SOURCES + qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp + qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands ++#silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands + QMAKE_EXTRA_COMPILERS += qtwayland_server_code +-- +1.8.3.1 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch similarity index 85% rename from recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch rename to recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 7c1e44590a..bea83a8993 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ -From 7a24e90118a0d81d76b68d3bd0dafcad0966e49e Mon Sep 17 00:00:00 2001 +From 05fc8b21f40d2e6bc35fa717ea340ef26f922d32 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/22] 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 @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index f8f0e9a..3c80d5f 100755 +index 40f2b02..11c11c4 100755 --- a/configure +++ b/configure -@@ -842,20 +842,7 @@ fi'` +@@ -849,20 +849,7 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" @@ -40,5 +40,5 @@ index f8f0e9a..3c80d5f 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch similarity index 91% rename from recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch rename to recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 66df3688ff..b6c3ae31b1 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ -From b115685d8c684181a0af79e44a1d170a5a8bfd05 Mon Sep 17 00:00:00 2001 +From b4f8c636cb265951979868a65006ce49f442e5e7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/22] 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 @@ -33,5 +33,5 @@ index b4569df..d189e50 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch similarity index 86% rename from recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch rename to recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch index 0a50ee0d44..2c4fa20bba 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0013-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ -From 7455bfff17483c19d7eef3ad81a95f6996ff0ce8 Mon Sep 17 00:00:00 2001 +From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/23] Disable mkv8snapshot +Subject: [PATCH 13/22] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -30,11 +30,11 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 3c80d5f..50dbebf 100755 +index 11c11c4..521e374 100755 --- a/configure +++ b/configure -@@ -902,7 +902,7 @@ CFG_SKIP_MODULES="" - CFG_COMPILE_EXAMPLES=auto +@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" + CFG_COMPILE_EXAMPLES=yes CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto -CFG_V8SNAPSHOT=auto @@ -43,5 +43,5 @@ index 3c80d5f..50dbebf 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch similarity index 89% rename from recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch rename to recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch index 38b1e65995..56b4a66343 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ -From 6da394a759ada8c3dcc6649dbbdf89918d675ae7 Mon Sep 17 00:00:00 2001 +From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/23] enables tslib device to be read from env variable +Subject: [PATCH 14/22] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch similarity index 92% rename from recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch rename to recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch index 068467a697..59c9466929 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ -From 94a5ed9c22ed927123df3007d426de5d19e4f692 Mon Sep 17 00:00:00 2001 +From 52172f09d646949c32f7b70188f1ffc779adbdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/23] qtbase: allow build of examples +Subject: [PATCH 15/22] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 - } } -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch similarity index 89% rename from recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch rename to recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch index 2069fffb5c..add3e25a7b 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 41a9c47ca820502d98039273f7465605464cdf9c Mon Sep 17 00:00:00 2001 +From cc2bdb0bbbbeb4eb630d82b7274d13922eb06da2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support +Subject: [PATCH 16/22] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644 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 +index 78f5080..20db620 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -90,7 +90,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -99,7 +99,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -107,7 +107,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -137,11 +137,11 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index 7d49c03..d9eb3fe 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); +@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); @@ -150,5 +150,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch similarity index 90% rename from recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch rename to recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch index e081e69a47..e17e5ac94b 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0020-Use-BGRA-extension-in-bindTexture.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch @@ -1,7 +1,7 @@ -From fb16e96ffef959e45c9cbcbef4cc4f51065f2e47 Mon Sep 17 00:00:00 2001 +From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH 20/23] Use BGRA extension in bindTexture +Subject: [PATCH 17/22] Use BGRA extension in bindTexture Upstream-Status: Pending @@ -30,5 +30,5 @@ index 94b8288..5c8aa3c 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch similarity index 78% rename from recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch rename to recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch index 797f258b82..eaa3ae67c6 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0021-configure-make-pulseaudio-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -1,7 +1,7 @@ -From 9f79c8047289b9c5bff025a46757bfd5f9bfec4b Mon Sep 17 00:00:00 2001 +From 0bc48cdb5e3556a96320ea963d2e031b0810d0d4 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 21/23] configure: make pulseaudio a configurable option +Subject: [PATCH 18/22] configure: make pulseaudio a configurable option Allows disabling pulseaudio support at configure time. @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 50dbebf..3b511d4 100755 +index 521e374..896e012 100755 --- a/configure +++ b/configure -@@ -1980,6 +1980,13 @@ while [ "$#" -gt 0 ]; do +@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -32,5 +32,5 @@ index 50dbebf..3b511d4 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch similarity index 76% rename from recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch rename to recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch index 5fe40805f7..c01f635b3c 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0022-configure-make-alsa-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch @@ -1,7 +1,7 @@ -From a51b5c64a33a0c8b411aa4317356c7dfcb99e452 Mon Sep 17 00:00:00 2001 +From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Jul 2013 23:21:28 +0200 -Subject: [PATCH 22/23] configure: make alsa a configurable option +Subject: [PATCH 19/22] configure: make alsa a configurable option Allows disabling alsa support at configure time. @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 3b511d4..2a0be04 100755 +index 896e012..3470b32 100755 --- a/configure +++ b/configure -@@ -1987,6 +1987,13 @@ while [ "$#" -gt 0 ]; do +@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -31,5 +31,5 @@ index 3b511d4..2a0be04 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch similarity index 77% rename from recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch rename to recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch index d8ad4b8273..9cec921ff9 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0023-configure-make-freetype-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch @@ -1,7 +1,7 @@ -From eef64dc5f4d998518c314a765bc0a9db7f6fdf9b Mon Sep 17 00:00:00 2001 +From 98201094967e2e4224c394d0c92c0be7d39582a6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 20 Jul 2013 10:56:37 +0200 -Subject: [PATCH 23/23] configure: make freetype a configurable option +Subject: [PATCH 20/22] configure: make freetype a configurable option Allows disabling freetype support at configure time. @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 2a0be04..64fbaeb 100755 +index 3470b32..b0ec977 100755 --- a/configure +++ b/configure -@@ -1994,6 +1994,13 @@ while [ "$#" -gt 0 ]; do +@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -31,5 +31,5 @@ index 2a0be04..64fbaeb 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch similarity index 93% rename from recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch rename to recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch index 7ca5e80886..70c0c0e09c 100644 --- a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -1,8 +1,8 @@ -From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001 +From b4d383bf47374c7132ecbcaec2c6aea31f858f54 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to - host binaries +Subject: [PATCH 21/22] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries Upstream-Status: Inappropiate (configuration) @@ -14,7 +14,7 @@ Signed-off-by: Simon Busch 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a804278..b6fbbea 100644 +index e01b448..5382730 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -45,7 +45,7 @@ index a804278..b6fbbea 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..3209e42 100644 +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) @@ -67,7 +67,7 @@ index 1d94715..3209e42 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index e5650ff..7fb8b21 100644 +index e5650ff..16ff007 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) @@ -80,5 +80,5 @@ index e5650ff..7fb8b21 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -1.8.1.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qtbase-native_5.1.0.bb b/recipes-qt/qt5/qtbase-native_5.1.1.bb similarity index 64% rename from recipes-qt/qt5/qtbase-native_5.1.0.bb rename to recipes-qt/qt5/qtbase-native_5.1.1.bb index 563e000ee4..2ee644c05f 100644 --- a/recipes-qt/qt5/qtbase-native_5.1.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.1.1.bb @@ -7,5 +7,5 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" -SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" +SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" +SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b6927d1a05..b2fa6455ef 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -22,7 +22,6 @@ SRC_URI += " \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ - file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb deleted file mode 100644 index 54e2da94a9..0000000000 --- a/recipes-qt/qt5/qtbase_5.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += " \ - file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ -" - -SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" -SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" diff --git a/recipes-qt/qt5/qtbase_5.1.1.bb b/recipes-qt/qt5/qtbase_5.1.1.bb new file mode 100644 index 0000000000..8fd161a8e1 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" +SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" From f40e53b1cbd8ce798490116a0484fccdb888a206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:56:10 +0200 Subject: [PATCH 238/347] qtjsbackend: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- ...01-Install-the-mkv8snapshot-tool-to-the-native-side.patch | 0 .../0002-v8.pro-respect-external-host-bindir-when-set.patch | 0 recipes-qt/qt5/qtjsbackend-native_5.1.0.bb | 5 ----- recipes-qt/qt5/qtjsbackend-native_5.1.1.bb | 5 +++++ recipes-qt/qt5/qtjsbackend_5.1.0.bb | 5 ----- recipes-qt/qt5/qtjsbackend_5.1.1.bb | 5 +++++ 6 files changed, 10 insertions(+), 10 deletions(-) rename recipes-qt/qt5/{qtjsbackend-5.1.0 => qtjsbackend-5.1.1}/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch (100%) rename recipes-qt/qt5/{qtjsbackend-5.1.0 => qtjsbackend-5.1.1}/0002-v8.pro-respect-external-host-bindir-when-set.patch (100%) delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_5.1.0.bb create mode 100644 recipes-qt/qt5/qtjsbackend_5.1.1.bb diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch similarity index 100% rename from recipes-qt/qt5/qtjsbackend-5.1.0/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch rename to recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch diff --git a/recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch similarity index 100% rename from recipes-qt/qt5/qtjsbackend-5.1.0/0002-v8.pro-respect-external-host-bindir-when-set.patch rename to recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb deleted file mode 100644 index fcc7cde617..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" -SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb new file mode 100644 index 0000000000..aac7b850ee --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" +SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192" diff --git a/recipes-qt/qt5/qtjsbackend_5.1.0.bb b/recipes-qt/qt5/qtjsbackend_5.1.0.bb deleted file mode 100644 index fcc7cde617..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bb4a74f3cd1db59274c9f4aaca0912af" -SRC_URI[sha256sum] = "8df057d527f98b1c2aa2941ff22adaf9b9c6441ea0e6c44f91f49bbcdbab57ce" diff --git a/recipes-qt/qt5/qtjsbackend_5.1.1.bb b/recipes-qt/qt5/qtjsbackend_5.1.1.bb new file mode 100644 index 0000000000..aac7b850ee --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" +SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192" From d90d6ed18e0b9b5d3ecff4315945004dcf4224d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:56:33 +0200 Subject: [PATCH 239/347] qtsvg: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsvg_5.1.0.bb | 5 ----- recipes-qt/qt5/qtsvg_5.1.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtsvg_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsvg_5.1.1.bb diff --git a/recipes-qt/qt5/qtsvg_5.1.0.bb b/recipes-qt/qt5/qtsvg_5.1.0.bb deleted file mode 100644 index b54484dfaa..0000000000 --- a/recipes-qt/qt5/qtsvg_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "394d33cc5d6b7aafbaae5a4f1d9e6652" -SRC_URI[sha256sum] = "50fc66ada43472e42245c18095e9eac84b496a634736cf55aac81326e4aad54a" diff --git a/recipes-qt/qt5/qtsvg_5.1.1.bb b/recipes-qt/qt5/qtsvg_5.1.1.bb new file mode 100644 index 0000000000..4dcb243e91 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.1.1.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9db8209602b0ea942273e01a874ea5b7" +SRC_URI[sha256sum] = "6bfe7705ff58391205ca797d84ca6dda57ebcce106fdff52d4908b0e443567bf" + From 56eb7fdac93ece1efd720c17af48e59d1bf9c6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:56:50 +0200 Subject: [PATCH 240/347] qtxmlpatterns: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtxmlpatterns_5.1.0.bb | 5 ----- recipes-qt/qt5/qtxmlpatterns_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.0.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.1.bb diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb deleted file mode 100644 index f054159516..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1d1ebc4d6efa4d05368c0c716858d314" -SRC_URI[sha256sum] = "9d06493a4387d19e561f79f79c0a9c4c333eb764d64af54dc05f13a978694537" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb new file mode 100644 index 0000000000..646e32a871 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0db5f74de2a2e93bc2747a609ff81d5f" +SRC_URI[sha256sum] = "bc7b48347ce3ab5d6a22223c001659f3d898cbd3ef9e35688d7ad1bf8e7510b5" From 976d9af04725f156d2dd8b4e0277d4ef1789d008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:57:17 +0200 Subject: [PATCH 241/347] qtdeclarative: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../0001-qmltestexample-fix-link.patch | 0 ...03-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 0 .../qt5/{qtdeclarative_5.1.0.bb => qtdeclarative_5.1.1.bb} | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes-qt/qt5/{qtdeclarative-5.1.0 => qtdeclarative-5.1.1}/0001-qmltestexample-fix-link.patch (100%) rename recipes-qt/qt5/{qtdeclarative-5.1.0 => qtdeclarative-5.1.1}/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (100%) rename recipes-qt/qt5/{qtdeclarative_5.1.0.bb => qtdeclarative_5.1.1.bb} (68%) diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch rename to recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch rename to recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch diff --git a/recipes-qt/qt5/qtdeclarative_5.1.0.bb b/recipes-qt/qt5/qtdeclarative_5.1.1.bb similarity index 68% rename from recipes-qt/qt5/qtdeclarative_5.1.0.bb rename to recipes-qt/qt5/qtdeclarative_5.1.1.bb index 2421bdbf9c..be724691de 100644 --- a/recipes-qt/qt5/qtdeclarative_5.1.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.1.1.bb @@ -6,8 +6,8 @@ SRC_URI += " \ file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " -SRC_URI[md5sum] = "604a6e3ae051a21aac0024694d55cb3b" -SRC_URI[sha256sum] = "d8849755c17fca9bb44c09c442001bc5593c24986ea616c536719414e85d90cc" +SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c" +SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31" # /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png FILES_${PN}-qmlplugins += " \ From 5f3c5e66fa90721db651f8102c1e7bc4d03c1e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:57:36 +0200 Subject: [PATCH 242/347] qtgraphicaleffects: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb | 5 ----- recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb deleted file mode 100644 index 3d24d7ab17..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0e38ef686197fbf1207a9510f07d0656" -SRC_URI[sha256sum] = "ea30ed7c3523d1a800a63cb888096cef89c61b590bfc81ba815ab9b12e283a89" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb new file mode 100644 index 0000000000..311f11342d --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "40d0989d68fb08c1184b7d5088da9c48" +SRC_URI[sha256sum] = "347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf" From cdca7796919242d2845d06e5814b7b8f473ed569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:57:53 +0200 Subject: [PATCH 243/347] qtimageformats: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats_5.1.0.bb | 5 ----- recipes-qt/qt5/qtimageformats_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtimageformats_5.1.0.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.1.1.bb diff --git a/recipes-qt/qt5/qtimageformats_5.1.0.bb b/recipes-qt/qt5/qtimageformats_5.1.0.bb deleted file mode 100644 index b7a8b08ddb..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "6dfab2e481e90ce74e89c646b91a11ca" -SRC_URI[sha256sum] = "c740442a46715e32a45f60e42fda76afd8430bf0004ee1f7147aa77cf92ed846" diff --git a/recipes-qt/qt5/qtimageformats_5.1.1.bb b/recipes-qt/qt5/qtimageformats_5.1.1.bb new file mode 100644 index 0000000000..ccb539ac5c --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "209edddd5899b36ea7ea7ad52204a593" +SRC_URI[sha256sum] = "3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4" From 4109beed991f8aed1c33a232fd28e6a80ab0daa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:58:10 +0200 Subject: [PATCH 244/347] qtmultimedia: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia_5.1.0.bb | 5 ----- recipes-qt/qt5/qtmultimedia_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtmultimedia_5.1.0.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.1.1.bb diff --git a/recipes-qt/qt5/qtmultimedia_5.1.0.bb b/recipes-qt/qt5/qtmultimedia_5.1.0.bb deleted file mode 100644 index 97ef3ba60f..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "ae0301809ca504b4b67d817fd46f9a2e" -SRC_URI[sha256sum] = "1df262e4d8d16f83511a096974a5a14af21d366493c5302d549e3dc52fa0b00f" diff --git a/recipes-qt/qt5/qtmultimedia_5.1.1.bb b/recipes-qt/qt5/qtmultimedia_5.1.1.bb new file mode 100644 index 0000000000..f8b61ce403 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "4b6e74bd7752bc241617f41539632bba" +SRC_URI[sha256sum] = "df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe" From 6fbf68d13ba2d82531936498a89d8b60f0914aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:58:28 +0200 Subject: [PATCH 245/347] qtscript: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript_5.1.0.bb | 5 ----- recipes-qt/qt5/qtscript_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtscript_5.1.0.bb create mode 100644 recipes-qt/qt5/qtscript_5.1.1.bb diff --git a/recipes-qt/qt5/qtscript_5.1.0.bb b/recipes-qt/qt5/qtscript_5.1.0.bb deleted file mode 100644 index d9bd00fc81..0000000000 --- a/recipes-qt/qt5/qtscript_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "c9348cdc39826c717c75b930a7b5a3bf" -SRC_URI[sha256sum] = "0cbe2e472657673ec8bd2f1ad133140b498292065159e67355f427e903c46d9b" diff --git a/recipes-qt/qt5/qtscript_5.1.1.bb b/recipes-qt/qt5/qtscript_5.1.1.bb new file mode 100644 index 0000000000..d43e7891bb --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "5c0e8633fbf560f711b7af689f8bcb99" +SRC_URI[sha256sum] = "d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364" From 0e5231d08eee74e3e0bc8a3324c59093a90991bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:58:43 +0200 Subject: [PATCH 246/347] qtsensors: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsensors_5.1.0.bb | 5 ----- recipes-qt/qt5/qtsensors_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtsensors_5.1.0.bb create mode 100644 recipes-qt/qt5/qtsensors_5.1.1.bb diff --git a/recipes-qt/qt5/qtsensors_5.1.0.bb b/recipes-qt/qt5/qtsensors_5.1.0.bb deleted file mode 100644 index 9d314eae47..0000000000 --- a/recipes-qt/qt5/qtsensors_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bcb4b546d1d39f2e27425b48bae90ac2" -SRC_URI[sha256sum] = "5cfd74323e8145a282fe840c47c639c064e832263744a24270f326a1464830ee" diff --git a/recipes-qt/qt5/qtsensors_5.1.1.bb b/recipes-qt/qt5/qtsensors_5.1.1.bb new file mode 100644 index 0000000000..a363d87221 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "219607895e15348d723fa67324d7061a" +SRC_URI[sha256sum] = "07f2d94964b47786a33ba1e24049c81b29e95b791647f9116ea350dc4cbc814f" From 67cb9cddb10a2eb88586b09f0be2e9e55338dd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 23:23:46 +0200 Subject: [PATCH 247/347] qtsystems: don't depend on qtjsondb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsystems.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index f7672b1f6c..8b2a770519 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc @@ -1,6 +1,6 @@ require qt5.inc -DEPENDS += "qtbase qtdeclarative qtjsondb udev bluez4 gconf" +DEPENDS += "qtbase qtdeclarative udev bluez4 gconf" LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" # LICENSE files are missing in 5.0.0 From f3681a0c6b4d74b020051283e4f15dbfebe53865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 23:45:09 +0200 Subject: [PATCH 248/347] qtquick1: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquick1_5.1.0.bb | 5 ----- recipes-qt/qt5/qtquick1_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtquick1_5.1.0.bb create mode 100644 recipes-qt/qt5/qtquick1_5.1.1.bb diff --git a/recipes-qt/qt5/qtquick1_5.1.0.bb b/recipes-qt/qt5/qtquick1_5.1.0.bb deleted file mode 100644 index c29f96ed0c..0000000000 --- a/recipes-qt/qt5/qtquick1_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0c4c7b81258dd889e020b6025f542387" -SRC_URI[sha256sum] = "51d83033c2012de9806be13434b48430401c395c0d0a58390ada290581b3fc5f" diff --git a/recipes-qt/qt5/qtquick1_5.1.1.bb b/recipes-qt/qt5/qtquick1_5.1.1.bb new file mode 100644 index 0000000000..bc07600415 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "05956168e0a4bba44c31b61dd4fc5e6e" +SRC_URI[sha256sum] = "f5dc431fb33a195414d2d75d7dff1c101f4101489f38b4ea9c5e8782b1807a64" From 4a94c9a0f1a4c96c8bb946657f2929a4c7e7e775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 Oct 2013 00:52:53 +0200 Subject: [PATCH 249/347] qtlocation: don't depend on qtjsondb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jsondb is not listed a a dependencies on qtlocation in sync.profile and was removed in more recent versions as qtjsondb is no more maintained Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc index 348ca40eb8..70a4375524 100644 --- a/recipes-qt/qt5/qtlocation.inc +++ b/recipes-qt/qt5/qtlocation.inc @@ -1,4 +1,4 @@ require qt5.inc -DEPENDS += "qtbase qt3d qtjsondb" +DEPENDS += "qtbase qt3d" # qtsystems qtmultimedia From 070247fe7c57c4a1328eefd7cb084d1612d909cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 23:45:54 +0200 Subject: [PATCH 250/347] qtwebkit: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_5.1.0.bb | 5 ----- recipes-qt/qt5/qtwebkit_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebkit_5.1.0.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.1.1.bb diff --git a/recipes-qt/qt5/qtwebkit_5.1.0.bb b/recipes-qt/qt5/qtwebkit_5.1.0.bb deleted file mode 100644 index 77725e3b94..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "fad7e7d6637719c2be101f9b3957d451" -SRC_URI[sha256sum] = "b49c4cfae697ea67142e7b35ecb0e3fec06814153e8226b8c6655c4dafc92ac3" diff --git a/recipes-qt/qt5/qtwebkit_5.1.1.bb b/recipes-qt/qt5/qtwebkit_5.1.1.bb new file mode 100644 index 0000000000..afb2dc2e19 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "70e956dafcee1969de53d4de7b4691ad" +SRC_URI[sha256sum] = "d6ee1e9111b0996277a512ae71736a05faa7c0de6d69ac2978adce79c3116a24" From ca2cac7ed05de1fbcfb9a3b7544aa145e127c23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 23:46:10 +0200 Subject: [PATCH 251/347] qtwebkit-examples: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit-examples_5.1.0.bb | 5 ----- recipes-qt/qt5/qtwebkit-examples_5.1.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.1.0.bb create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.1.1.bb diff --git a/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb deleted file mode 100644 index 1e671b6b55..0000000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "a27360f16e4ca31e3d1098d1b2feba73" -SRC_URI[sha256sum] = "f8078a87df729103e6009432e5b784531842997197827f67db8a34f1715f8921" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb new file mode 100644 index 0000000000..d0f61de494 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "660b4e169a13074d2edcc3110a7b5ba8" +SRC_URI[sha256sum] = "1297212198790f186cb647dcfa929fd2de0824bd04578cf041355e4eabb33ff2" From aeb1302888a576b6c4a7588cf299e8b6ab56d86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 Oct 2013 10:26:40 +0200 Subject: [PATCH 252/347] qtquickcontrols: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquickcontrols_5.1.0.bb | 5 ----- recipes-qt/qt5/qtquickcontrols_5.1.1.bb | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.1.0.bb create mode 100644 recipes-qt/qt5/qtquickcontrols_5.1.1.bb diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.0.bb b/recipes-qt/qt5/qtquickcontrols_5.1.0.bb deleted file mode 100644 index fc880d75f1..0000000000 --- a/recipes-qt/qt5/qtquickcontrols_5.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "b3825124a173a36f63c2f8380dc61e81" -SRC_URI[sha256sum] = "88d39421d78464c3900c37616e8369fc8d998c1b0f611980e6e082f46569646b" diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.1.bb b/recipes-qt/qt5/qtquickcontrols_5.1.1.bb new file mode 100644 index 0000000000..ea6c7f97dd --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.1.1.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "6482ee0c4b11119ae5cb5080e61c18c0" +SRC_URI[sha256sum] = "52fe58cb83f7b76d46abd12485713a7bd62a3b2739a7271098e0a1ea25d9fec3" + From 04458354f18b41e93cba5907296b2317aef1fd05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 Oct 2013 10:27:12 +0200 Subject: [PATCH 253/347] qtserialport: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../qt5/{qtserialport_5.1.0.bb => qtserialport_5.1.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-qt/qt5/{qtserialport_5.1.0.bb => qtserialport_5.1.1.bb} (66%) diff --git a/recipes-qt/qt5/qtserialport_5.1.0.bb b/recipes-qt/qt5/qtserialport_5.1.1.bb similarity index 66% rename from recipes-qt/qt5/qtserialport_5.1.0.bb rename to recipes-qt/qt5/qtserialport_5.1.1.bb index 11b5346027..78c982a52e 100644 --- a/recipes-qt/qt5/qtserialport_5.1.0.bb +++ b/recipes-qt/qt5/qtserialport_5.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\ " -SRC_URI[md5sum] = "1f70621ae40cbda948106b070c6c37d2" -SRC_URI[sha256sum] = "0f36803c480b2b7111b343e9dd871ffab1b4fd53147bd564125ef2994b09cfb9" +SRC_URI[md5sum] = "83bba7e8f27d6d6d5a0d2fdcb5641d7f" +SRC_URI[sha256sum] = "aee1a277b64dc70be6d7d0504e35f2df52a83b41ab65c344119e76222ceb063b" From c845e487d7ce6227f60332b5130812fc8b1e7f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 Oct 2013 10:27:31 +0200 Subject: [PATCH 254/347] qttools-native: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- ...build-only-lrelease-lupdate-lconvert.patch | 22 ++++++++++--------- ...ative_5.1.0.bb => qttools-native_5.1.1.bb} | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) rename recipes-qt/qt5/{qttools-5.1.0 => qttools-5.1.1}/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (90%) rename recipes-qt/qt5/{qttools-native_5.1.0.bb => qttools-native_5.1.1.bb} (66%) diff --git a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch similarity index 90% rename from recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch rename to recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index f1b8783507..a5f26a3c72 100644 --- a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,4 +1,4 @@ -From 4df58d96ea516358d2762a219c0b196e56c8e89b Mon Sep 17 00:00:00 2001 +From 9337242944c936104db5eee64df804a27fb02bb8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert @@ -15,8 +15,8 @@ Signed-off-by: Martin Jansa src/designer/src/src.pro | 16 +++++++++------- src/linguist/linguist.pro | 2 +- src/src.pro | 10 ++++++---- - tests/auto/auto.pro | 20 +++++++++++--------- - 5 files changed, 29 insertions(+), 23 deletions(-) + tests/auto/auto.pro | 22 ++++++++++++---------- + 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 4955969..8e86419 100644 @@ -103,10 +103,10 @@ index c8756db..d71c4a0 100644 qtNomakeTools( \ pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index 074aa34..a744d46 100644 +index eaf440b..1778ad1 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro -@@ -1,13 +1,15 @@ +@@ -1,14 +1,16 @@ TEMPLATE=subdirs -SUBDIRS=\ - linguist \ @@ -116,7 +116,8 @@ index 074aa34..a744d46 100644 - qhelpgenerator \ - qhelpindexmodel \ - qhelpprojectdata \ -- cmake +- cmake \ +- installed_cmake +!linguistonly { + SUBDIRS=\ + linguist \ @@ -126,11 +127,12 @@ index 074aa34..a744d46 100644 + qhelpgenerator \ + qhelpindexmodel \ + qhelpprojectdata \ -+ cmake ++ cmake \ ++ installed_cmake +} - # These tests don't make sense for cross-compiled builds - cross_compile:SUBDIRS -= host.pro + installed_cmake.depends = cmake + -- -1.8.3.2 +1.8.3.1 diff --git a/recipes-qt/qt5/qttools-native_5.1.0.bb b/recipes-qt/qt5/qttools-native_5.1.1.bb similarity index 66% rename from recipes-qt/qt5/qttools-native_5.1.0.bb rename to recipes-qt/qt5/qttools-native_5.1.1.bb index 1da72a4ac9..82b8c01e2a 100644 --- a/recipes-qt/qt5/qttools-native_5.1.0.bb +++ b/recipes-qt/qt5/qttools-native_5.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ " -SRC_URI[md5sum] = "f3cc602d4b720a847f4ab0953a82d8ef" -SRC_URI[sha256sum] = "9b9aa948e01bf9d0fc7fa4584ededf9b5b280ee74c334c5790dbc6f9015b3738" +SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" +SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" From 35a7c923cc280e188c287e0825ed4f2b6e1b9e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Tue, 8 Oct 2013 00:32:07 +0200 Subject: [PATCH 255/347] qt: use 5.1.1 by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index f534de70a6..7e2d76efbd 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.1.0", "5.1.0+git%" +# possible values now "5.1.1", "5.1.0+git%" -QT5_VERSION ?= "5.1.0" +QT5_VERSION ?= "5.1.1" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" From 0cf24787efdc1d20f846fd5838ec5d5b4e8ac9cf Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 8 Oct 2013 04:35:14 +0000 Subject: [PATCH 256/347] qtwebkit-examples: enable building and packaging of examples by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: binaries will go into ${PN}-examples, which is qtwebkit-examples-examples Signed-off-by: Denys Dmytriyenko Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit-examples.inc | 4 +++ ...s-enable-building-examples-by-defaul.patch | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc index e8fa3e72c1..38b2a7cbf4 100644 --- a/recipes-qt/qt5/qtwebkit-examples.inc +++ b/recipes-qt/qt5/qtwebkit-examples.inc @@ -4,4 +4,8 @@ LICENSE = "BSD & LGPLv2+" LIC_FILES_CHKSUM = "file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=112;md5=6f92d041824c63426993c8ce3ae0eb77 \ file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=223;md5=13ffb472fefe4bdf6464954a22251f35" +SRC_URI += " \ + file://0001-qtwebkit-examples-enable-building-examples-by-defaul.patch \ +" + DEPENDS += "qtwebkit" diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch new file mode 100644 index 0000000000..34d9622e90 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch @@ -0,0 +1,29 @@ +From 50ab1eaf41445459422ef1fd4070ee158ea55d1c Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Tue, 8 Oct 2013 00:18:10 -0400 +Subject: [PATCH] qtwebkit-examples: enable building examples by default + +Examples are provided in sources, but the build for them is not enabled by +default. Since example binaries are packaged separately to ${PN}-examples, +having them built by default makes more sense. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Denys Dmytriyenko +--- + qtwebkit-examples.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro +index 3fcecf1..2da8a36 100644 +--- a/qtwebkit-examples.pro ++++ b/qtwebkit-examples.pro +@@ -2,4 +2,4 @@ requires(qtHaveModule(webkit)) + + load(qt_parts) + +-SUBDIRS += doc ++SUBDIRS += doc examples +-- +1.8.3.2 + From 67be00639756dd0193b090da5d759b134b2e9436 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 8 Oct 2013 04:07:46 +0000 Subject: [PATCH 257/347] qtbase.inc: PACKAGECONFIG[linuxfb] shouldn't depend on nonexistent linuxfb package Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b2fa6455ef..5d2d598f11 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -106,7 +106,7 @@ PACKAGECONFIG[gstreamer] = "-gstreamer,-no-gstreamer,gstreamer" PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" -PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb,linuxfb" +PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,kms" # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) From 2ecccc2ca2eb017b32db3697f2750b9e7aec78e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 26 Sep 2013 09:45:47 +0000 Subject: [PATCH 258/347] qtgraphicaleffects, qtquickcontrols: Don't use PN in PN-dev RDEPENDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix do_rootfs for images with dev-pkgs in IMAGE_FEATURES | Collected errors: | * satisfy_dependencies_for: Cannot satisfy the following dependencies for qtquickcontrols-dev: | * qtquickcontrols (= 5.1.0-r0) * | * opkg_install_cmd: Cannot install package qtquickcontrols-dev. Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtgraphicaleffects.inc | 2 ++ recipes-qt/qt5/qtquickcontrols.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index 63e884eaa6..2ced3c21ef 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc @@ -1,3 +1,5 @@ require qt5.inc DEPENDS += "qtdeclarative" + +RDEPENDS_${PN}-dev = "" diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc index 63e884eaa6..2ced3c21ef 100644 --- a/recipes-qt/qt5/qtquickcontrols.inc +++ b/recipes-qt/qt5/qtquickcontrols.inc @@ -1,3 +1,5 @@ require qt5.inc DEPENDS += "qtdeclarative" + +RDEPENDS_${PN}-dev = "" From 040dd25bedf46da3399f40c17ea2473a30fa2963 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 8 Oct 2013 12:10:10 +0200 Subject: [PATCH 259/347] qtjsondb: Remove unsupported module * https://bugreports.qt-project.org/browse/QTBUG-31741 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_5.1.1.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtjsondb.inc | 10 ---------- recipes-qt/qt5/qtjsondb_git.bb | 22 ---------------------- 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 recipes-qt/qt5/qtjsondb.inc delete mode 100644 recipes-qt/qt5/qtjsondb_git.bb diff --git a/recipes-qt/qt5/qtbase-native_5.1.1.bb b/recipes-qt/qt5/qtbase-native_5.1.1.bb index 2ee644c05f..612553c655 100644 --- a/recipes-qt/qt5/qtbase-native_5.1.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.1.1.bb @@ -3,7 +3,7 @@ require ${PN}.inc do_install_append() { # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) - # e.g. qt3d, qtjsondb, qtwayland + # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0db74da8ab..96e7c29883 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc do_install_append() { # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) - # e.g. qt3d, qtjsondb, qtwayland + # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } diff --git a/recipes-qt/qt5/qtjsondb.inc b/recipes-qt/qt5/qtjsondb.inc deleted file mode 100644 index 33816de3e1..0000000000 --- a/recipes-qt/qt5/qtjsondb.inc +++ /dev/null @@ -1,10 +0,0 @@ -require qt5.inc - -DEPENDS += "qtdeclarative ${ICU}" - -LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" -# this is for latest SRCREV: -LIC_FILES_CHKSUM = "file://${S}/doc/src/qtjsondb.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \ - file://${S}/examples/jsondb-client/example.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \ - file://${S}/src/client/qjsondbglobal.h;endline=40;md5=34f5660524f0d70941d0416511ef49a0 \ -" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb deleted file mode 100644 index 012bf9a3ea..0000000000 --- a/recipes-qt/qt5/qtjsondb_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require qt5-git.inc -require ${PN}.inc - -# qtjsondb wasn't released yet, last tag before this SRCREV isn't even 5.0.0-beta1, but lets use it for now -PV = "4.999+5.0.0-beta1+git${SRCPV}" - -QT_MODULE_BRANCH = "master" - -SRCREV = "27a2b5d9a0f081f71c26a1716721411606f8dedf" - -do_configure_prepend() { - # Temporary hack to get qtjsondb build for Qt 5.1.0 - if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then - echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf - fi -} - -do_configure_append() { - # work around for this issue: - # http://www.mail-archive.com/ci-reports@qt-project.org/msg09692.html - sed -i '/^INCPATH/s#-I\.$#-I. -I../../include/QtJsonDbPartition#g' ${B}/src/client/Makefile -} From ee4ef2a303ffb1f7da8e84f15b27ff72d609df59 Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Tue, 8 Oct 2013 15:18:16 +0000 Subject: [PATCH 260/347] qt5.inc: extend FILES_${PN}-examples-* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this fix : ERROR: QA Issue: non debug package contains .debug directory: qtquick1-examples path /work/armv7a-vfp-neon-oe-linux-gnueabi/qtquick1/5.1.1-r0/packages-split/qtquick1-examples/ usr/share/qt5/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/.debug/libqmlqtimeexampleplugin.so Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index f1fd9517f8..268ddd7b00 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -115,6 +115,8 @@ FILES_${PN}-examples-dev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ " FILES_${PN}-examples-dbg = " \ ${OE_QMAKE_PATH_EXAMPLES}/.debug \ @@ -123,6 +125,8 @@ FILES_${PN}-examples-dbg = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/.debug \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/.debug \ " FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*.a \ @@ -131,6 +135,8 @@ FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ + ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ " PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" From 096a380851bcd17f0f9a20dc42589d431a47f555 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 9 Oct 2013 13:20:56 +0000 Subject: [PATCH 261/347] qtbase: add upstream QTBUG-31579 patch for QPainter regression Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ....y-is-also-initalized-to-1-when-nece.patch | 47 +++++++++++++++++++ ....y-is-also-initalized-to-1-when-nece.patch | 47 +++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 3 files changed, 95 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch create mode 100644 recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch diff --git a/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch new file mode 100644 index 0000000000..0d5330599d --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch @@ -0,0 +1,47 @@ +From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001 +From: Andy Shaw +Date: Tue, 8 Oct 2013 15:45:42 +0200 +Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary + +Task-number: QTBUG-31579 + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578] +Signed-off-by: Jonathan Liu + +Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e +Reviewed-by: Gunnar Sletta +--- + src/gui/painting/qcosmeticstroker.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 39f6422..a2301e3 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp ++++ b/src/gui/painting/qcosmeticstroker.cpp +@@ -305,6 +305,7 @@ void QCosmeticStroker::setup() + ymax = deviceRect.bottom() + 2; + + lastPixel.x = -1; ++ lastPixel.y = -1; + } + + // returns true if the whole line gets clipped away +@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF p = QPointF(points[0], points[1]) * state->matrix; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + bool closed; + const QPainterPath::ElementType *e = subPath(type, end, points, &closed); +@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF movedTo = p; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + const qreal *begin = points; + const qreal *end = points + 2*path.elementCount(); +-- +1.8.4 + diff --git a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch new file mode 100644 index 0000000000..0d5330599d --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch @@ -0,0 +1,47 @@ +From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001 +From: Andy Shaw +Date: Tue, 8 Oct 2013 15:45:42 +0200 +Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary + +Task-number: QTBUG-31579 + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578] +Signed-off-by: Jonathan Liu + +Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e +Reviewed-by: Gunnar Sletta +--- + src/gui/painting/qcosmeticstroker.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 39f6422..a2301e3 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp ++++ b/src/gui/painting/qcosmeticstroker.cpp +@@ -305,6 +305,7 @@ void QCosmeticStroker::setup() + ymax = deviceRect.bottom() + 2; + + lastPixel.x = -1; ++ lastPixel.y = -1; + } + + // returns true if the whole line gets clipped away +@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF p = QPointF(points[0], points[1]) * state->matrix; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + bool closed; + const QPainterPath::ElementType *e = subPath(type, end, points, &closed); +@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + QPointF movedTo = p; + patternOffset = state->lastPen.dashOffset()*64; + lastPixel.x = -1; ++ lastPixel.y = -1; + + const qreal *begin = points; + const qreal *end = points + 2*path.elementCount(); +-- +1.8.4 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5d2d598f11..559f54d4c6 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -22,6 +22,7 @@ SRC_URI += " \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ + file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \ " DEPENDS += "qtbase-native" From 3e95350611d0e58e4e773c9b3b004a7a161f94f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Oct 2013 12:35:42 +0200 Subject: [PATCH 262/347] qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI * commit 105ad2a18e20f2b07d20a1640917e69950c8496b Author: Eric Bnard Date: Mon Oct 7 22:54:12 2013 +0200 Subject: qtbase: update to 5.1.1 removed it from SRC_URI in qtbase.inc, but it's still needed for qtbase_git Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2994d3fae9..30d5b237c0 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc +SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch" + SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" From af6014e3bc82b0f9998978819e217b6e020ccdc0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Oct 2013 12:37:26 +0200 Subject: [PATCH 263/347] qtbase: Disable fontconfig by default * it was explicitly disabled in commit 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3 Author: Philip Craig Date: Wed Jun 26 02:13:02 2013 +0000 Subject: qtbase: disable fontconfig support by default * and then accidentaly enabled with PACKAGECONFIG changes commit ebdd83f6b7e5c3296e5ebd3b7b0c1e0defe5aba5 Author: Martin Jansa Date: Sat Jul 20 00:02:57 2013 +0200 Subject: qtbase: explicitly enable or disable all deps * Thanks to Nicolas Dechesne for reporting it Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 559f54d4c6..d1831a1a67 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -40,7 +40,7 @@ RDEPENDS_${PN}-tools += "perl" PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" -PACKAGECONFIG_FONTS ?= "fontconfig freetype" +PACKAGECONFIG_FONTS ?= "freetype" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" From 4c177a661fd1ef599835de56776b0ebda6d78e3c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 11 Oct 2013 22:12:19 +0200 Subject: [PATCH 264/347] qtbase: Disable freetype by default * building qbasicfontdatabase fails without fontconfig enabled | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38: fatal error: freetype/config/ftheader.h: No such file or directory | #include | ^ | compilation terminated. | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1 | make[2]: *** Waiting for unfinished jobs.... Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index d1831a1a67..b752a0654f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -40,7 +40,7 @@ RDEPENDS_${PN}-tools += "perl" PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle', '', d)}" -PACKAGECONFIG_FONTS ?= "freetype" +PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" From e1d2257f60272df30bf182396d5b1e81b1196581 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 11 Oct 2013 22:12:19 +0200 Subject: [PATCH 265/347] qtbase: Use bundled freetype by default * system freetype works only together with fontconfig * building qbasicfontdatabase fails with system freetype and without fontconfig or with freetype completely disabled | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38: fatal error: freetype/config/ftheader.h: No such file or directory | #include | ^ | compilation terminated. | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1 | make[2]: *** Waiting for unfinished jobs.... Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b752a0654f..889ab9985f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -68,7 +68,10 @@ PACKAGECONFIG[examples] = ",-nomake examples" # accessibility is required to compile qtquickcontrols PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" -PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype" +# use either system freetype or bundled freetype, if you disable freetype completely +# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype +# works only together with fontconfig +PACKAGECONFIG[freetype] = "-system-freetype,-freetype,freetype" PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" From 5ecfb7dc5457059bef8a5906f80550c90063ab56 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 19 Oct 2013 12:11:48 +0000 Subject: [PATCH 266/347] maliit-frameworks-qt5: provide ${datadir} also by EXTRA_QMAKEVARS_PRE Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index ccd0c4cbbf..56d1082d3a 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -49,6 +49,7 @@ FILES_${PN}-dev += "\ EXTRA_QMAKEVARS_PRE = "\ PREFIX=${prefix} \ LIBDIR=${libdir} \ + DATADIR=${datadir} \ QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \ MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \ SCHEMADIR=${sysconfdir}/gconf/schemas \ From 3763998ed02ea127c62bba0e7478e817c282d57b Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 19 Oct 2013 12:11:49 +0000 Subject: [PATCH 267/347] maliit-framework-qt5: don't replace directory names for maliit-defines.prf The values from maliit-defines.prf are only used at runtime and not at compilation time so we don't have to replace them with the proper staging paths. Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 56d1082d3a..35d21cad1e 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -68,7 +68,6 @@ do_install_append() { #Fix absolute paths sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf - sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-defines.prf install -d ${D}${datadir}/applications install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications From a5de4e3856ad77b0e1ad9a4181ccbd3a91a87f31 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 19 Oct 2013 12:15:00 +0000 Subject: [PATCH 268/347] maliit-plugins-qt5: add dependency on libqt5svg-plugins Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-plugins-qt5_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index fa3d1fd6d4..273b3e4c90 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -13,8 +13,7 @@ OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" DEPENDS = "maliit-framework-qt5" -# FIXME: Do we need something like this with qt5? -#RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg" +RDEPENDS_${PN} += "qtsvg-plugins" SRC_URI = "git://github.com/maliit/plugins.git;branch=master" From 84cd4be2491895b0c3a0af64e4c83d58910d1f6c Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sun, 20 Oct 2013 16:48:55 +0000 Subject: [PATCH 269/347] maliit-framework-qt5: package only ${libdir}/qt5/mkspecs within ${PN}-dev When we're building maliit with it's input context plugin enable it gets installed into ${libdir}/qt5/plugins/platforminputcontexts which couldn't be added to ${PN} cause it's already in ${PN}-dev and the only part which should go into ${PN}-dev is ${libdir}/qt5/mksepcs and nothing else from ${libdir}/qt5. Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 35d21cad1e..2d8360339f 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -43,7 +43,7 @@ FILES_${PN}-dbg += "\ FILES_${PN}-dev += "\ ${includedir}/maliit \ ${libdir}/pkgconfig \ - ${libdir}/qt5 \ + ${libdir}/qt5/mkspecs \ " EXTRA_QMAKEVARS_PRE = "\ From c36be1724a71f2f62cc09c28e34547165a80cce7 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 24 Oct 2013 10:56:37 +0000 Subject: [PATCH 270/347] qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...election-region-with-text-when-cente.patch | 74 +++++++++++++++++++ ...election-region-with-text-when-cente.patch | 74 +++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 3 files changed, 149 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch create mode 100644 recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch diff --git a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch new file mode 100644 index 0000000000..d5e082ea78 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch @@ -0,0 +1,74 @@ +From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Wed, 23 Oct 2013 00:28:17 +1100 +Subject: [PATCH] Fix misaligned selection region with text when centered + +If the text is centered, the x/y position in the selection QRectF may +be a multiple of 0.5 which is rounded up. This rounding causes +misalignment of the selection region with the text. + +The alignment is fixed by using qFloor on the x and y components. + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842] +Signed-off-by: Jonathan Liu + +Task-number: QTBUG-34218 +Task-number: QTBUG-34234 +Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f +Reviewed-by: Gunnar Sletta +--- + src/gui/text/qtextlayout.cpp | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp +index 54d337e..66341e1 100644 +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -44,6 +44,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo + continue; + } + +- if (lastSelectionWidth > 0) +- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); ++ if (lastSelectionWidth > 0) { ++ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); ++ rect.moveLeft(qFloor(rect.left())); ++ rect.moveTop(qFloor(rect.top())); ++ region->addRect(rect); ++ } + + lastSelectionX = selectionX; + lastSelectionWidth = selectionWidth; + } + } +- if (lastSelectionWidth > 0) +- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); ++ if (lastSelectionWidth > 0) { ++ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); ++ rect.moveLeft(qFloor(rect.left())); ++ rect.moveTop(qFloor(rect.top())); ++ region->addRect(rect); ++ } + } + + static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) +@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q + + QBrush bg = chf.background(); + if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool()) +- p->fillRect(r, bg); ++ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg); + if (c.style() != Qt::NoBrush) { + p->setPen(QPen(c, 0)); + } +-- +1.8.4 + diff --git a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch new file mode 100644 index 0000000000..d5e082ea78 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch @@ -0,0 +1,74 @@ +From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Wed, 23 Oct 2013 00:28:17 +1100 +Subject: [PATCH] Fix misaligned selection region with text when centered + +If the text is centered, the x/y position in the selection QRectF may +be a multiple of 0.5 which is rounded up. This rounding causes +misalignment of the selection region with the text. + +The alignment is fixed by using qFloor on the x and y components. + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842] +Signed-off-by: Jonathan Liu + +Task-number: QTBUG-34218 +Task-number: QTBUG-34234 +Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f +Reviewed-by: Gunnar Sletta +--- + src/gui/text/qtextlayout.cpp | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp +index 54d337e..66341e1 100644 +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -44,6 +44,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo + continue; + } + +- if (lastSelectionWidth > 0) +- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); ++ if (lastSelectionWidth > 0) { ++ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); ++ rect.moveLeft(qFloor(rect.left())); ++ rect.moveTop(qFloor(rect.top())); ++ region->addRect(rect); ++ } + + lastSelectionX = selectionX; + lastSelectionWidth = selectionWidth; + } + } +- if (lastSelectionWidth > 0) +- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); ++ if (lastSelectionWidth > 0) { ++ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); ++ rect.moveLeft(qFloor(rect.left())); ++ rect.moveTop(qFloor(rect.top())); ++ region->addRect(rect); ++ } + } + + static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) +@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q + + QBrush bg = chf.background(); + if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool()) +- p->fillRect(r, bg); ++ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg); + if (c.style() != Qt::NoBrush) { + p->setPen(QPen(c, 0)); + } +-- +1.8.4 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 889ab9985f..ffb37ce43b 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -23,6 +23,7 @@ SRC_URI += " \ file://0023-configure-make-freetype-a-configurable-option.patch \ file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \ + file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \ " DEPENDS += "qtbase-native" From 9f0f1dc647f1097058218cd2e31ed5d054d5164f Mon Sep 17 00:00:00 2001 From: Kristofer Hansson Aspman Date: Fri, 25 Oct 2013 15:26:27 +0000 Subject: [PATCH 271/347] qtconnectivity: Add recipe. Signed-off-by: Kristofer Hansson Aspman Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtconnectivity.inc | 13 +++++++++++++ recipes-qt/qt5/qtconnectivity_git.bb | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 recipes-qt/qt5/qtconnectivity.inc create mode 100644 recipes-qt/qt5/qtconnectivity_git.bb diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc new file mode 100644 index 0000000000..c0a51470f6 --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity.inc @@ -0,0 +1,13 @@ +require qt5.inc + +DEPENDS += "qtbase qtdeclarative" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[bluez4] = ",,bluez4" + +do_configure_prepend() { + # disable bluez test if it isn't enabled by PACKAGECONFIG + sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro +} + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb new file mode 100644 index 0000000000..334ae3534f --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${BPN}.inc + +SRCREV = "c21addb23f2eb67dc55853b115e5b735df065891" From ffe8a0e0ad7e8594ace8c36abb11503bd1668658 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Tue, 22 Oct 2013 15:38:01 +0000 Subject: [PATCH 272/347] qtwebkit-examples: add missing RDEPENDS for qmlplugins Some examples require qtwebkit-qmlplugins (flickerview, youtubeview), and this dependency is not automatically added. Without this patch, and without manually adding qtwekbit-qmlplugins, we get errors like this: qrc:///flickrview.qml:42:1: module "QtWebKit" is not installed Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc index 38b2a7cbf4..50c28cdb7a 100644 --- a/recipes-qt/qt5/qtwebkit-examples.inc +++ b/recipes-qt/qt5/qtwebkit-examples.inc @@ -9,3 +9,4 @@ SRC_URI += " \ " DEPENDS += "qtwebkit" +RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" From f11778340c574de8cf46b9980a4f8c5b1fa50410 Mon Sep 17 00:00:00 2001 From: Iktwo Sh Date: Mon, 21 Oct 2013 18:54:55 -0700 Subject: [PATCH 273/347] qtx11extras: Add recipe Signed-off-by: Iktwo Sh Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtx11extras.inc | 3 +++ recipes-qt/qt5/qtx11extras_5.1.1.bb | 5 +++++ recipes-qt/qt5/qtx11extras_git.bb | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 recipes-qt/qt5/qtx11extras.inc create mode 100644 recipes-qt/qt5/qtx11extras_5.1.1.bb create mode 100644 recipes-qt/qt5/qtx11extras_git.bb diff --git a/recipes-qt/qt5/qtx11extras.inc b/recipes-qt/qt5/qtx11extras.inc new file mode 100644 index 0000000000..bbb05a6557 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras.inc @@ -0,0 +1,3 @@ +require qt5.inc + +DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtx11extras_5.1.1.bb b/recipes-qt/qt5/qtx11extras_5.1.1.bb new file mode 100644 index 0000000000..3d4d03086b --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_5.1.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "b5910f7f503baf56082f89bce917651b" +SRC_URI[sha256sum] = "a37f9e9436497ef96bd644b264752a415ffef57d5f5886010f079e332620c02a" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb new file mode 100644 index 0000000000..1d4a7253e8 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" From faa07fc3a61f16a5de5b548f74c155a81dd86190 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 29 Oct 2013 12:16:06 +0100 Subject: [PATCH 274/347] cmake: Rename and update .bbappend to match new version from oe-core Signed-off-by: Martin Jansa --- .../cmake/cmake_2.8.11.2.bbappend | 7 ------- recipes-devtools/cmake/cmake_2.8.12.bbappend | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 recipes-devtools/cmake/cmake_2.8.11.2.bbappend create mode 100644 recipes-devtools/cmake/cmake_2.8.12.bbappend diff --git a/recipes-devtools/cmake/cmake_2.8.11.2.bbappend b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend deleted file mode 100644 index 0ad2d2fb48..0000000000 --- a/recipes-devtools/cmake/cmake_2.8.11.2.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable -# and possibly missing qmake binary (qtbase-native can be removed from sysroot -# e.g. in order to upgrade it, even when there is target qtbase) - -do_configure_prepend() { - sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt -} diff --git a/recipes-devtools/cmake/cmake_2.8.12.bbappend b/recipes-devtools/cmake/cmake_2.8.12.bbappend new file mode 100644 index 0000000000..ebacf720e6 --- /dev/null +++ b/recipes-devtools/cmake/cmake_2.8.12.bbappend @@ -0,0 +1,20 @@ +# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable +# and possibly missing qmake binary (qtbase-native can be removed from sysroot +# e.g. in order to upgrade it, even when there is target qtbase) + +#| -- Performing Test run_pic_test - Success +#| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): +#| The imported target "Qt5::Core" references the file +#| +#| "/qmake" +#| +#| but this file does not exist. Possible reasons include: + +do_configure_prepend() { + sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt + sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake + sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt + sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt + sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt + sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt +} From d6c3d39a70609c9ce81649af4a923db7185b2b7e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 2 Nov 2013 14:21:44 +0100 Subject: [PATCH 275/347] maliit-framework-qt5: Add missing dependency on qtbase Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 2d8360339f..e7f8eb6207 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -24,6 +24,8 @@ PV = "0.99.0+git${SRCPV}" PACKAGES =+ "${PN}-gtk" GTKIMMODULES_PACKAGES = "${PN}-gtk" +DEPENDS = "qtbase" + # FIXME: Do we need something like this with qt5? #RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4" From a6753fa646f714bd0a794d270bd77e951d8204ac Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 4 Nov 2013 12:13:11 +0100 Subject: [PATCH 276/347] maliit-framework-qt5: Add missing dependency on qtdeclarative * it needs also quick and qml, so qtbase wasn't enough Signed-off-by: Martin Jansa --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index e7f8eb6207..b6d8cb34d9 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -24,7 +24,7 @@ PV = "0.99.0+git${SRCPV}" PACKAGES =+ "${PN}-gtk" GTKIMMODULES_PACKAGES = "${PN}-gtk" -DEPENDS = "qtbase" +DEPENDS = "qtdeclarative" # FIXME: Do we need something like this with qt5? #RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4" From 7327781083aea593b4911b6da7105e4984e28c68 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 4 Nov 2013 23:12:21 +0100 Subject: [PATCH 277/347] qtwayland: Fix Project ERROR: Module v8 has no public API Signed-off-by: Martin Jansa --- .../qtwayland/fix.missing.v8.public.api.patch | 30 +++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch diff --git a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch new file mode 100644 index 0000000000..6bbbaa1ebc --- /dev/null +++ b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch @@ -0,0 +1,30 @@ +From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 +From: Carsten Munk +Date: Wed, 17 Jul 2013 07:28:04 +0000 +Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: *** + [sub-qml-compositor-make_first] Error 3 + +Cherry-picked from: +https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 + +Signed-off-by: Carsten Munk +--- + qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro +index 0bc0b02..e397002 100644 +--- a/examples/qml-compositor/qml-compositor.pro ++++ b/examples/qml-compositor/qml-compositor.pro +@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK + + LIBS += -L ../../lib + +-QT += quick qml v8 ++QT += quick qml + QT += quick-private + + QT += compositor +-- +1.8.4 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ca7f3de117..02971d66af 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -5,6 +5,8 @@ require ${PN}.inc # this PV is only to indicate that this recipe is compatible with qt5 5.1.0 PV = "5.1.0+git${SRCPV}" +SRC_URI += "file://fix.missing.v8.public.api.patch" + # newer revisions depend on newer wayland-1.1 APIs SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3" # SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" From 662ff3043a4a308e09e7628bf11260aa60341937 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 15 Nov 2013 18:52:03 +0100 Subject: [PATCH 278/347] cmake: Rename .bbappend to match new version from oe-core Signed-off-by: Martin Jansa --- .../cmake/{cmake_2.8.12.bbappend => cmake_2.8.12.1.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-devtools/cmake/{cmake_2.8.12.bbappend => cmake_2.8.12.1.bbappend} (100%) diff --git a/recipes-devtools/cmake/cmake_2.8.12.bbappend b/recipes-devtools/cmake/cmake_2.8.12.1.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake_2.8.12.bbappend rename to recipes-devtools/cmake/cmake_2.8.12.1.bbappend From 7b898fdc664ca04d50becddb7f57570436bd717e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 25 Nov 2013 20:47:57 -0500 Subject: [PATCH 279/347] nativesdk-qtbase: add nativesdk version of qtbase necessary for SDK tools Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qt5.inc | 12 ++ recipes-qt/qt5/nativesdk-qtbase.inc | 193 ++++++++++++++++++ recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb | 5 + ...ath-length-from-256-to-512-character.patch | 29 +++ ...ve-built-qmake-and-swap-with-native-.patch | 29 +++ 5 files changed, 268 insertions(+) create mode 100644 recipes-qt/qt5/nativesdk-qt5.inc create mode 100644 recipes-qt/qt5/nativesdk-qtbase.inc create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch diff --git a/recipes-qt/qt5/nativesdk-qt5.inc b/recipes-qt/qt5/nativesdk-qt5.inc new file mode 100644 index 0000000000..2eb8c1423e --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qt5.inc @@ -0,0 +1,12 @@ +inherit nativesdk qmake5_base + +# 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-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc new file mode 100644 index 0000000000..8e9a8097d9 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -0,0 +1,193 @@ +DESCRIPTION = "SDK version of Qt/[X11|Mac|Embedded]" +DEPENDS = "nativesdk-zlib nativesdk-dbus qtbase-native" +SECTION = "libs" +HOMEPAGE = "http://qt-project.org" + +QT_MODULE = "qtbase" + +require nativesdk-qt5.inc + +# shared with target version +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_functions-temporary-remove-isEmpty-check.patch \ + file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0013-Disable-mkv8snapshot.patch \ + file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ + file://0015-qtbase-allow-build-of-examples.patch \ + file://0021-configure-make-pulseaudio-a-configurable-option.patch \ + file://0022-configure-make-alsa-a-configurable-option.patch \ + file://0023-configure-make-freetype-a-configurable-option.patch \ + file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ +" + +# specific for nativesdk version +SRC_URI += " \ + file://0001-Always-build-uic.patch \ + file://0001-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0001-configure-bump-path-length-from-256-to-512-character.patch \ +" + +PACKAGES = "${PN}-tools-dbg ${PN}-tools" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN}-tools-dbg = " \ + ${OE_QMAKE_PATH_BINS}/.debug \ +" + +FILES_${PN}-tools = " \ + ${OE_QMAKE_PATH_BINS}/* \ +" + +QT_CONFIG_FLAGS += " \ + -reduce-relocations \ + -shared \ + -silent \ + -no-pch \ + -no-rpath \ + -pkg-config \ + ${EXTRA_OECONF} \ +" + +# qtbase is exception, as these are used as install path for sysroots +OE_QMAKE_PATH_HOST_DATA = "${libdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HOST_LIBS = "${libdir}" + +do_generate_qt_config_file() { + cat > ${QT_CONF_PATH} <> ${QT_CONF_PATH} < +Date: Mon, 11 Nov 2013 20:27:30 -0500 +Subject: [PATCH] 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 304d30f..a37a587 100755 +--- a/configure ++++ b/configure +@@ -3870,7 +3870,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] = { + "qt_prfxpath=$QT_INSTALL_PREFIX", + "qt_docspath=$QT_INSTALL_DOCS", + "qt_hdrspath=$QT_INSTALL_HEADERS", +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch new file mode 100644 index 0000000000..048eab769e --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch @@ -0,0 +1,29 @@ +From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Mon, 11 Nov 2013 20:22:34 -0500 +Subject: [PATCH] configure: preserve built qmake and swap with native one + +Let configure script build the real qmake, but right after it's built, swap +it with a native qmake for further internal use, preserving the real one. + +Signed-off-by: Denys Dmytriyenko +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index 140c7b4..304d30f 100755 +--- a/configure ++++ b/configure +@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + + (cd "$outpath/qmake"; "$MAKE") || exit 2 + fi # Build qmake ++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" ++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" + + echo "Running configuration tests..." + +-- +1.8.3.2 + From 512c859380a36b753b5fcca21a31aea4d85a1737 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 25 Nov 2013 23:33:37 -0500 Subject: [PATCH 280/347] nativesdk-qttools: add nativesdk version of qttools necessary for SDK tools Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qttools.inc | 25 +++++++++++++++++++++++ recipes-qt/qt5/nativesdk-qttools_5.1.1.bb | 7 +++++++ 2 files changed, 32 insertions(+) create mode 100644 recipes-qt/qt5/nativesdk-qttools.inc create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.1.1.bb diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc new file mode 100644 index 0000000000..e9b294984d --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools.inc @@ -0,0 +1,25 @@ +DEPENDS = "nativesdk-qtbase qtbase-native" + +QT_MODULE = "qttools" + +require nativesdk-qt5.inc + +SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN}-dbg = " \ + ${OE_QMAKE_PATH_BINS}/.debug \ +" + +FILES_${PN} = " \ + ${OE_QMAKE_PATH_BINS}/* \ +" + +do_configure() { + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} diff --git a/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb new file mode 100644 index 0000000000..b56f430bfc --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb @@ -0,0 +1,7 @@ +require qt5-${PV}.inc +require ${PN}.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools-${PV}:" + +SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" +SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" From 343101669c91d03d92e714a8cb2ff55a8bb4c924 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 25 Nov 2013 23:33:44 -0500 Subject: [PATCH 281/347] qttools-native: remove previous license workaround Previously license files were missing for qttools module, so we used to point to generic files with same license. Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools-native.inc | 7 ------- recipes-qt/qt5/qttools-native_5.1.1.bb | 5 ----- 2 files changed, 12 deletions(-) diff --git a/recipes-qt/qt5/qttools-native.inc b/recipes-qt/qt5/qttools-native.inc index cc1e05666f..03b88cd122 100644 --- a/recipes-qt/qt5/qttools-native.inc +++ b/recipes-qt/qt5/qttools-native.inc @@ -1,10 +1,3 @@ -# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git -LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ -" - DEPENDS = "qtbase-native" QT_MODULE = "qttools" diff --git a/recipes-qt/qt5/qttools-native_5.1.1.bb b/recipes-qt/qt5/qttools-native_5.1.1.bb index 82b8c01e2a..e10484e33d 100644 --- a/recipes-qt/qt5/qttools-native_5.1.1.bb +++ b/recipes-qt/qt5/qttools-native_5.1.1.bb @@ -1,10 +1,5 @@ require qt5-${PV}.inc require ${PN}.inc -# LICENSE files are missing in 5.0.0 and 5.0.1 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \ -" - SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" From 72ca958ebfb61640c614ec865196d68fba2576c2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Dec 2013 14:41:46 +0100 Subject: [PATCH 282/347] qtlocation, qtsystems: Fix QT_MODULE_BRANCH Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation_git.bb | 2 -- recipes-qt/qt5/qtsystems_git.bb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ddf3bcb618..66032b6aad 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -7,6 +7,4 @@ PV = "4.999+5.0.0-beta1+git${SRCPV}" # drop when bumping SRCREV PR = "r1" -QT_MODULE_BRANCH = "master" - SRCREV = "f28408346243cf090326f4738fd838219c21e00f" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index b1126f5122..5456dfb7ac 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -7,6 +7,6 @@ PV = "4.999+5.0.0-beta1+git${SRCPV}" # drop when bumping SRCREV PR = "r1" -QT_MODULE_BRANCH = "master" +QT_MODULE_BRANCH = "dev" SRCREV = "701442ad6358b9f27978aafae82074124468f88c" From 57709a4ee2213a3c352b9cedce1d4b16a1b35042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Tue, 3 Dec 2013 16:20:55 +0100 Subject: [PATCH 283/347] qt5.inc: allow to set the package arch globally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If Qt5 (qtbase) is machine specific, then all packages depending on qtbase will also be machine specific, because the (initial) qtbase configuration becomes part of Qt5/qmake, thus affecting builds of packages built against this specific version of qtbase. Since it is not feasible to add PACKAGE_ARCH=... to each and every recipe that is built using qmake and depends on Qt5, we introduce a new variable, QT_PACKAGES_ARCH, that can be set by the machine configuration as needed. We have to be careful though to only change the architecture of the resulting packages if we're not compiling a 'native' package. Signed-off-by: André Draszik Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 268ddd7b00..426ed555f0 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -20,6 +20,18 @@ 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}" +# If Qt5 (qtbase) is machine specific, then everything will be, +# because the (initial) qtbase configuration becomes part of Qt5/qmake +python __anonymous() { + barch = d.getVar("BUILD_ARCH", True) or '' + tarch = d.getVar("TARGET_ARCH", True) or '' + # do not do anything if we are building a native package + if barch != tarch: + tarch = d.getVar("QT_PACKAGES_ARCH", True) or '' + if tarch: + d.setVar("PACKAGE_ARCH", tarch) +} + PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " # extra -dbg packages From 775d77e482f1ea203c78003cccd2547075fd720f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 31 Dec 2013 12:07:29 +0100 Subject: [PATCH 284/347] qtwebkit: Depend on gstreamer-1.0 instead of 0.10 * since this commit: commit e0debe138cb59c140ebbc69755d36028d2b89459 Author: Allan Sandfeld Jensen Date: Thu Feb 28 13:42:27 2013 +0100 Subject: Switch QtWebKit to GStreamer 1.0. qtwebkit supports 1.0 and will use that by default when found Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index c0e0648097..2d211c7b16 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt" +DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" From c908fe4ebd5a04813be0b83c173fae182bb22728 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 2 Nov 2013 19:06:14 +0100 Subject: [PATCH 285/347] qt5: upgrade to 5.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 5 +- recipes-qt/qt5/nativesdk-qtbase.inc | 34 +- recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb | 5 - recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb | 5 + recipes-qt/qt5/nativesdk-qttools_5.1.1.bb | 7 - recipes-qt/qt5/nativesdk-qttools_5.2.0.bb | 5 + recipes-qt/qt5/qt3d_git.bb | 8 +- .../qt5/{qt5-5.1.1.inc => qt5-5.2.0.inc} | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qt5.inc | 1 + .../0001-Add-linux-oe-g-platform.patch | 304 ------------ .../qtbase-5.1.1/0001-Always-build-uic.patch | 40 -- ...ow-to-set-qt.conf-from-the-outside-u.patch | 36 -- .../0003-Add-external-hostbindir-option.patch | 219 --------- ...tions-temporary-remove-isEmpty-check.patch | 51 -- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 -- ...-qt_module-Fix-pkgconfig-replacement.patch | 70 --- ...09-qt_module-Fix-paths-in-.prl-files.patch | 62 --- ...wayland-scanner-disable-silent-rules.patch | 82 ---- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 -- .../0013-Disable-mkv8snapshot.patch | 47 -- ...-device-to-be-read-from-env-variable.patch | 35 -- .../0015-qtbase-allow-build-of-examples.patch | 48 -- ...-QOpenGLPaintDevice-sub-area-support.patch | 154 ------ ...20-Use-BGRA-extension-in-bindTexture.patch | 34 -- ...ake-pulseaudio-a-configurable-option.patch | 36 -- ...gure-make-alsa-a-configurable-option.patch | 35 -- ...-make-freetype-a-configurable-option.patch | 35 -- ....y-is-also-initalized-to-1-when-nece.patch | 47 -- ...election-region-with-text-when-cente.patch | 74 --- .../qtbase-git/0001-Always-build-uic.patch | 40 -- ...tions-temporary-remove-isEmpty-check.patch | 51 -- ...ke-is-already-built-in-qtbase-native.patch | 30 -- ...ding-a-separate-qmake-for-the-target.patch | 29 -- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 -- ...-qt_module-Fix-pkgconfig-replacement.patch | 70 --- ...09-qt_module-Fix-paths-in-.prl-files.patch | 62 --- ...wayland-scanner-disable-silent-rules.patch | 82 ---- ...Allow-to-add-extra-arguments-to-make.patch | 37 -- .../0013-Disable-mkv8snapshot.patch | 47 -- ...20-Use-BGRA-extension-in-bindTexture.patch | 34 -- ...ake-pulseaudio-a-configurable-option.patch | 36 -- ...gure-make-alsa-a-configurable-option.patch | 35 -- ...-make-freetype-a-configurable-option.patch | 35 -- ...H_EXTERNAL_HOST_BINS-to-determine-pa.patch | 84 ---- ...ix-data-corruption-in-readData-metho.patch | 41 -- ....y-is-also-initalized-to-1-when-nece.patch | 47 -- ...election-region-with-text-when-cente.patch | 74 --- recipes-qt/qt5/qtbase-native.inc | 28 +- ...native_5.1.1.bb => qtbase-native_5.2.0.bb} | 4 +- recipes-qt/qt5/qtbase-native_git.bb | 23 +- recipes-qt/qt5/qtbase.inc | 35 +- .../0001-Add-linux-oe-g-platform.patch | 22 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 10 +- .../0003-Add-external-hostbindir-option.patch | 105 +++-- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 29 ++ ...-qt_module-Fix-pkgconfig-replacement.patch | 117 +++++ ...xport-SYSTEM_VARIABLES-to-.qmake.va.patch} | 15 +- ...llow-to-add-extra-arguments-to-make.patch} | 10 +- ...ulseaudio-alsa-freetype-a-configurab.patch | 49 ++ ...E_PATH_EXTERNAL_HOST_BINS-to-determ.patch} | 11 +- .../qt5/qtbase/0010-Always-build-uic.patch | 38 ++ ...e-is-already-built-in-qtbase-native.patch} | 10 +- ...ing-a-separate-qmake-for-the-target.patch} | 25 +- ...e-built-qmake-and-swap-with-native-.patch} | 11 +- ...th-length-from-256-to-512-character.patch} | 16 +- ...0012-qtbase-allow-build-of-examples.patch} | 6 +- ...QOpenGLPaintDevice-sub-area-support.patch} | 22 +- ...-device-to-be-read-from-env-variable.patch | 6 +- recipes-qt/qt5/qtbase_5.1.1.bb | 5 - recipes-qt/qt5/qtbase_5.2.0.bb | 5 + recipes-qt/qt5/qtbase_git.bb | 4 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- ...culation-of-viewPort-for-transitions.patch | 41 -- .../0001-qmltestexample-fix-link.patch | 46 -- recipes-qt/qt5/qtdeclarative.inc | 7 +- .../0001-qmltestexample-fix-link.patch | 0 ...culation-of-viewPort-for-transitions.patch | 0 recipes-qt/qt5/qtdeclarative_5.1.1.bb | 15 - recipes-qt/qt5/qtdeclarative_5.2.0.bb | 5 + recipes-qt/qt5/qtdeclarative_git.bb | 7 +- recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb | 5 - recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb | 5 + recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_5.1.1.bb | 5 - recipes-qt/qt5/qtimageformats_5.2.0.bb | 5 + recipes-qt/qt5/qtimageformats_git.bb | 2 +- ...mkv8snapshot-tool-to-the-native-side.patch | 32 -- ...espect-external-host-bindir-when-set.patch | 31 -- ...mkv8snapshot-tool-to-the-native-side.patch | 32 -- ...espect-external-host-bindir-when-set.patch | 31 -- recipes-qt/qt5/qtjsbackend-native.inc | 24 - recipes-qt/qt5/qtjsbackend-native_5.1.1.bb | 5 - recipes-qt/qt5/qtjsbackend-native_git.bb | 4 - recipes-qt/qt5/qtjsbackend.inc | 14 - recipes-qt/qt5/qtjsbackend_5.1.1.bb | 5 - recipes-qt/qt5/qtjsbackend_git.bb | 4 - recipes-qt/qt5/qtlocation_git.bb | 8 +- recipes-qt/qt5/qtmultimedia_5.1.1.bb | 5 - recipes-qt/qt5/qtmultimedia_5.2.0.bb | 5 + recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_5.1.1.bb | 5 - recipes-qt/qt5/qtquick1_5.2.0.bb | 5 + recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_5.1.1.bb | 6 - recipes-qt/qt5/qtquickcontrols_5.2.0.bb | 6 + recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_5.1.1.bb | 5 - recipes-qt/qt5/qtscript_5.2.0.bb | 5 + recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_5.1.1.bb | 5 - recipes-qt/qt5/qtsensors_5.2.0.bb | 5 + recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialport.inc | 6 + recipes-qt/qt5/qtserialport_5.1.1.bb | 10 - recipes-qt/qt5/qtserialport_5.2.0.bb | 5 + recipes-qt/qt5/qtserialport_git.bb | 4 + recipes-qt/qt5/qtsvg_5.1.1.bb | 6 - recipes-qt/qt5/qtsvg_5.2.0.bb | 6 + recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 9 +- ...build-only-lrelease-lupdate-lconvert.patch | 138 ------ recipes-qt/qt5/qttools-native_5.1.1.bb | 5 - recipes-qt/qt5/qttools-native_5.2.0.bb | 5 + recipes-qt/qt5/qttools-native_git.bb | 2 +- ...build-only-lrelease-lupdate-lconvert.patch | 16 +- ...should-not-be-a-mandatory-dependency.patch | 46 -- ...hing-this-out-as-Qt5.0.0-does-not-ha.patch | 33 -- ...eKHR-requires-the-context-to-be-NULL.patch | 71 --- recipes-qt/qt5/qtwayland-native_git.bb | 7 +- recipes-qt/qt5/qtwayland.inc | 11 +- ...ylandscanner-tool-to-the-native-side.patch | 0 .../qtwayland/fix.missing.v8.public.api.patch | 30 -- recipes-qt/qt5/qtwayland_git.bb | 9 +- recipes-qt/qt5/qtwebkit-examples_5.1.1.bb | 5 - recipes-qt/qt5/qtwebkit-examples_5.2.0.bb | 5 + recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- recipes-qt/qt5/qtwebkit.inc | 3 +- .../0001-jsc-Add-licuuc-licui18n-LIBS.patch | 443 ++++++++++++++++++ recipes-qt/qt5/qtwebkit_5.1.1.bb | 5 - recipes-qt/qt5/qtwebkit_5.2.0.bb | 5 + recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtx11extras_5.1.1.bb | 5 - recipes-qt/qt5/qtx11extras_5.2.0.bb | 5 + recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.1.1.bb | 5 - recipes-qt/qt5/qtxmlpatterns_5.2.0.bb | 5 + recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 148 files changed, 1037 insertions(+), 3302 deletions(-) delete mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb delete mode 100644 recipes-qt/qt5/nativesdk-qttools_5.1.1.bb create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.2.0.bb rename recipes-qt/qt5/{qt5-5.1.1.inc => qt5-5.2.0.inc} (96%) delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch delete mode 100644 recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch rename recipes-qt/qt5/{qtbase-native_5.1.1.bb => qtbase-native_5.2.0.bb} (63%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0001-Add-linux-oe-g-platform.patch (95%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (82%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0003-Add-external-hostbindir-option.patch (73%) create mode 100644 recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch rename recipes-qt/qt5/{qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch => qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch} (78%) rename recipes-qt/qt5/{qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch => qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch} (86%) create mode 100644 recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch rename recipes-qt/qt5/{qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch => qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch} (93%) create mode 100644 recipes-qt/qt5/qtbase/0010-Always-build-uic.patch rename recipes-qt/qt5/{qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch => qtbase/0010-qmake-is-already-built-in-qtbase-native.patch} (74%) rename recipes-qt/qt5/{qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch => qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch} (51%) rename recipes-qt/qt5/{qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch => qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch} (71%) rename recipes-qt/qt5/{qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch => qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch} (66%) rename recipes-qt/qt5/{qtbase-git/0015-qtbase-allow-build-of-examples.patch => qtbase/0012-qtbase-allow-build-of-examples.patch} (92%) rename recipes-qt/qt5/{qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch => qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch} (89%) rename recipes-qt/qt5/{qtbase-git => qtbase}/0014-enables-tslib-device-to-be-read-from-env-variable.patch (89%) delete mode 100644 recipes-qt/qt5/qtbase_5.1.1.bb create mode 100644 recipes-qt/qt5/qtbase_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch rename recipes-qt/qt5/{qtdeclarative-5.1.1 => qtdeclarative}/0001-qmltestexample-fix-link.patch (100%) rename recipes-qt/qt5/{qtdeclarative-git => qtdeclarative}/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (100%) delete mode 100644 recipes-qt/qt5/qtdeclarative_5.1.1.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtimageformats_5.1.1.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch delete mode 100644 recipes-qt/qt5/qtjsbackend-native.inc delete mode 100644 recipes-qt/qt5/qtjsbackend-native_5.1.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend-native_git.bb delete mode 100644 recipes-qt/qt5/qtjsbackend.inc delete mode 100644 recipes-qt/qt5/qtjsbackend_5.1.1.bb delete mode 100644 recipes-qt/qt5/qtjsbackend_git.bb delete mode 100644 recipes-qt/qt5/qtmultimedia_5.1.1.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtquick1_5.1.1.bb create mode 100644 recipes-qt/qt5/qtquick1_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.1.1.bb create mode 100644 recipes-qt/qt5/qtquickcontrols_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtscript_5.1.1.bb create mode 100644 recipes-qt/qt5/qtscript_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtsensors_5.1.1.bb create mode 100644 recipes-qt/qt5/qtsensors_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtserialport_5.1.1.bb create mode 100644 recipes-qt/qt5/qtserialport_5.2.0.bb create mode 100644 recipes-qt/qt5/qtserialport_git.bb delete mode 100644 recipes-qt/qt5/qtsvg_5.1.1.bb create mode 100644 recipes-qt/qt5/qtsvg_5.2.0.bb delete mode 100644 recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch delete mode 100644 recipes-qt/qt5/qttools-native_5.1.1.bb create mode 100644 recipes-qt/qt5/qttools-native_5.2.0.bb rename recipes-qt/qt5/{qttools-5.1.1 => qttools}/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (93%) delete mode 100644 recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch delete mode 100644 recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch rename recipes-qt/qt5/{qtwayland-git => qtwayland}/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch (100%) delete mode 100644 recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.1.1.bb create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.2.0.bb create mode 100644 recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch delete mode 100644 recipes-qt/qt5/qtwebkit_5.1.1.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtx11extras_5.1.1.bb create mode 100644 recipes-qt/qt5/qtx11extras_5.2.0.bb delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.1.1.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.2.0.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 7e2d76efbd..3e33af0216 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.1.1", "5.1.0+git%" +# possible values now "5.2.0", "5.2.0+git%" -QT5_VERSION ?= "5.1.1" +QT5_VERSION ?= "5.2.0" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" @@ -14,6 +14,7 @@ PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}" PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" +PREFERRED_VERSION_qtserialport = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 8e9a8097d9..c4ef6e80e5 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -7,32 +7,28 @@ QT_MODULE = "qtbase" require nativesdk-qt5.inc -# shared with target version -SRC_URI += " \ +# common with -native and target version +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_functions-temporary-remove-isEmpty-check.patch \ - file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0008-qt_module-Fix-pkgconfig-replacement.patch \ - file://0009-qt_module-Fix-paths-in-.prl-files.patch \ - file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ - file://0013-Disable-mkv8snapshot.patch \ - file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ - file://0015-qtbase-allow-build-of-examples.patch \ - file://0021-configure-make-pulseaudio-a-configurable-option.patch \ - file://0022-configure-make-alsa-a-configurable-option.patch \ - file://0023-configure-make-freetype-a-configurable-option.patch \ - file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ + file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0005-qt_module-Fix-pkgconfig-replacement.patch \ + file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ + file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ +" + +# common with -native +SRC_URI += " \ + file://0010-Always-build-uic.patch \ " # specific for nativesdk version SRC_URI += " \ - file://0001-Always-build-uic.patch \ - file://0001-configure-preserve-built-qmake-and-swap-with-native-.patch \ - file://0001-configure-bump-path-length-from-256-to-512-character.patch \ + file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0012-configure-bump-path-length-from-256-to-512-character.patch \ " PACKAGES = "${PN}-tools-dbg ${PN}-tools" diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb deleted file mode 100644 index 8fd161a8e1..0000000000 --- a/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" -SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb new file mode 100644 index 0000000000..aca8dea09f --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" +SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" diff --git a/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb deleted file mode 100644 index b56f430bfc..0000000000 --- a/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools-${PV}:" - -SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" -SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb new file mode 100644 index 0000000000..0effa1bfa5 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" +SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 4a816c96df..7ca9bf85f8 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,16 +1,14 @@ require qt5-git.inc require ${PN}.inc -# last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" - QT_MODULE_BRANCH = "master" -SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058" +# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already +SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9" do_configure_prepend() { # Temporary hack to get qt3d build for Qt 5.1.0 if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then - echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf + echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf fi } diff --git a/recipes-qt/qt5/qt5-5.1.1.inc b/recipes-qt/qt5/qt5-5.2.0.inc similarity index 96% rename from recipes-qt/qt5/qt5-5.1.1.inc rename to recipes-qt/qt5/qt5-5.2.0.inc index 0de6539da9..50e8a7a097 100644 --- a/recipes-qt/qt5/qt5-5.1.1.inc +++ b/recipes-qt/qt5/qt5-5.2.0.inc @@ -4,7 +4,7 @@ QT_VERSION ?= "${PV}" # it's different for RC versions -QT_VERSION_DIR ?= "5.1" +QT_VERSION_DIR ?= "5.2" SRC_URI += " \ http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 987704726f..97a1c37dbd 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.1.0+git${SRCPV}" +PV = "5.2.0+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 426ed555f0..57ffe098ed 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -68,6 +68,7 @@ FILES_${PN}-qmlplugins = " \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ + ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch deleted file mode 100644 index 87c2612258..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch +++ /dev/null @@ -1,304 +0,0 @@ -From b91e232e603df102a1d305aceb0dbedc6ce3e89c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/22] 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 - -* 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: Pending - -Signed-off-by: Martin Jansa ---- - configure | 54 ++++++++++++++++--- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ - mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 3 files changed, 187 insertions(+), 7 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 140c7b4..397d53f 100755 ---- a/configure -+++ b/configure -@@ -291,6 +291,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 -@@ -300,6 +310,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" - for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" -@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then - CFG_QGTKSTYLE=no - fi - --QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX` - - TEST_COMPILER=$QMAKE_CONF_COMPILER - -@@ -2929,7 +2961,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 -@@ -3959,6 +3991,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..." -@@ -3997,11 +4037,11 @@ 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_CXXFLAGS -- setBootstrapVariable QMAKE_LFLAGS -+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CFLAGS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS -+ setBootstrapEvalVariable QMAKE_LFLAGS - - if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE -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 --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch deleted file mode 100644 index 96c85f05d2..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH 22/22] 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. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/src.pro b/src/src.pro -index b4c9602..f30ec1f 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions - src_plugins.depends += src_gui src_platformsupport - !contains(QT_CONFIG, no-widgets) { -- SUBDIRS += src_tools_uic src_widgets -+ SUBDIRS += src_widgets - src_plugins.depends += src_widgets - contains(QT_CONFIG, opengl(es1|es2)?) { - SUBDIRS += src_opengl -@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - } - } - } --SUBDIRS += src_plugins src_tools_qdoc -+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic - - nacl: SUBDIRS -= src_network src_testlib - --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index fab5880222..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a899fba459928c7e5196f15dcea4d561807dc825 Mon Sep 17 00:00:00 2001 -From: Holger Freyther -Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/22] 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, 4 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 53a3ebb..8ca2102 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -138,7 +138,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(); --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch deleted file mode 100644 index b4bf10f651..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 062621e0310eddb448ebcc27fc4c1507c2d6e30d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 16 +++++++++++++++- - mkspecs/features/qt_functions.prf | 5 ++++- - mkspecs/features/qt_tool.prf | 2 +- - qmake/property.cpp | 1 + - qtbase.pro | 12 +++++++++--- - src/corelib/global/qlibraryinfo.cpp | 3 ++- - src/corelib/global/qlibraryinfo.h | 1 + - tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 41 insertions(+), 7 deletions(-) - -diff --git a/configure b/configure -index 397d53f..80bdd7a 100755 ---- a/configure -+++ b/configure -@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= - QT_HOST_BINS= - QT_HOST_LIBS= - QT_HOST_DATA= -+QT_EXTERNAL_HOST_BINS= - - #flags for SQL drivers - QT_CFLAGS_PSQL= -@@ -1191,7 +1192,8 @@ while [ "$#" -gt 0 ]; do - -android-ndk-platform| \ - -android-ndk-host| \ - -android-arch| \ -- -android-toolchain-version) -+ -android-toolchain-version| \ -+ -external-hostbindir) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do - hostlibdir) - QT_HOST_LIBS="$VAL" - ;; -+ external-hostbindir) -+ QT_EXTERNAL_HOST_BINS="$VAL" -+ ;; - pkg-config) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PKGCONFIG="$VAL" -@@ -3240,6 +3245,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" - fi - -+# 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 -+ - #------------------------------------------------------------------------------- - # help - interactive parts of the script _after_ this section please - #------------------------------------------------------------------------------- -@@ -3408,6 +3418,9 @@ 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 -@@ -3923,6 +3936,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { - "qt_hbinpath=$QT_HOST_BINS", - "qt_hlibpath=$QT_HOST_LIBS", - "qt_hdatpath=$QT_HOST_DATA", -+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", - "qt_targspec=$shortxspec", - "qt_hostspec=$shortspec", - #endif -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 2f2c94c..4e12d3d 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { - defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS]/$$2 -+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ $$1 = $$[QT_HOST_BINS]/$$2 -+ } - exists($$eval($$1).pl) { - $$1 = perl -w $$eval($$1).pl - } else: contains(QMAKE_HOST.os, Windows) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 9a6b963..83ef3a0 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -16,7 +16,7 @@ CONFIG += console - # 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$, ) -diff --git a/qmake/property.cpp b/qmake/property.cpp -index 4685440..93eb1d4 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -75,6 +75,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/qtbase.pro b/qtbase.pro -index d6726b5..28ca7d5 100644 ---- a/qtbase.pro -+++ b/qtbase.pro -@@ -70,16 +70,22 @@ CONFIG -= qt - - #qmake - qmake.path = $$[QT_HOST_BINS] -+qmake.files = $$OUT_PWD/bin/qmake -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/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 - - #syncqt - syncqt.path = $$[QT_HOST_BINS] - syncqt.files = $$PWD/bin/syncqt.pl -+syncqt.files = $$PWD/bin/syncqt.pl -+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl -+} - INSTALLS += syncqt - - # If we are doing a prefix build, create a "module" pri which enables -diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 8ca2102..9f5d444 100644 ---- a/src/corelib/global/qlibraryinfo.cpp -+++ b/src/corelib/global/qlibraryinfo.cpp -@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() - */ - - static const struct { -- char key[19], value[13]; -+ char key[21], value[13]; - } qtConfEntries[] = { - { "Prefix", "." }, - { "Documentation", "doc" }, // should be ${Data}/doc -@@ -296,6 +296,7 @@ static const struct { - { "HostBinaries", "bin" }, - { "HostLibraries", "lib" }, - { "HostData", "." }, -+ { "ExternalHostBinaries", "" }, - { "TargetSpec", "" }, - { "HostSpec", "" }, - #endif -diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index b275e01..0e6baed 100644 ---- a/src/corelib/global/qlibraryinfo.h -+++ b/src/corelib/global/qlibraryinfo.h -@@ -84,6 +84,7 @@ public: - HostBinariesPath, - HostLibrariesPath, - HostDataPath, -+ ExternalHostBinariesPath, - TargetSpecPath, - HostSpecPath, - LastHostPath = HostSpecPath, -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index a6376bb..aed85ce 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() - dictionary[ "QT_HOST_DATA" ] = 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) -@@ -3708,6 +3715,7 @@ void Configure::generateQConfigCpp() - << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl - << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl - << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl -+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl - << " \"qt_targspec=" << targSpec << "\"," << endl - << " \"qt_hostspec=" << hostSpec << "\"," << endl - << "#endif" << endl --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index 955d791cf3..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/22] 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]. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 3 +-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 4e12d3d..e20ad9d 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS]/$$2 - } - exists($$eval($$1).pl) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 83ef3a0..21c9eb7 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -15,8 +15,7 @@ CONFIG += console - - # 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):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { - isEmpty(MODULE):MODULE = $$TARGET - - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 00affb1204..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c2cc1f9251953f680191c5cf53b019d5d480c79e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending ---- - 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 aed85ce..0575520 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3111,8 +3111,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index dfc018f2c6..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 0089c1ecba912aed6a8cd6126297300e0f7ffcb9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement - -* 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 390fb49..e85c2a8 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -140,18 +140,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - } - - unix { - CONFIG += create_libtool explicitlib -- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace - } - - unix|win32-g++* { --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 5c8f81890d..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index e85c2a8..7fcfcfe 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -144,17 +144,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index a91c9edf58..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9a2219a25247b76de6524d358211b55467305d11 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/22] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index b2eca41..46da374 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland_server_header.input = WAYLANDSERVERSOURCES - wayland_server_header.variable_out = HEADERS - wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands -+#silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands - QMAKE_EXTRA_COMPILERS += wayland_server_header - - wayland_client_header.name = wayland ${QMAKE_FILE_BASE} -@@ -18,7 +18,7 @@ wayland_client_header.input = WAYLANDCLIENTSOURCES - wayland_client_header.variable_out = HEADERS - wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands -+#silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands - QMAKE_EXTRA_COMPILERS += wayland_client_header - - wayland_code.name = wayland ${QMAKE_FILE_BASE} -@@ -26,7 +26,7 @@ wayland_code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES - wayland_code.variable_out = SOURCES - wayland_code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland_code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands -+#silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands - QMAKE_EXTRA_COMPILERS += wayland_code - - qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) -@@ -37,7 +37,7 @@ qtwayland_client_header.variable_out = HEADERS - qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands -+#silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands - QMAKE_EXTRA_COMPILERS += qtwayland_client_header - - qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -46,7 +46,7 @@ qtwayland_client_code.variable_out = SOURCES - qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp - qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands -+#silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands - QMAKE_EXTRA_COMPILERS += qtwayland_client_code - - qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE} -@@ -55,7 +55,7 @@ qtwayland_server_header.variable_out = HEADERS - qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands -+#silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands - QMAKE_EXTRA_COMPILERS += qtwayland_server_header - - qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -64,5 +64,5 @@ qtwayland_server_code.variable_out = SOURCES - qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp - qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands -+#silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands - QMAKE_EXTRA_COMPILERS += qtwayland_server_code --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index bea83a8993..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 05fc8b21f40d2e6bc35fa717ea340ef26f922d32 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/22] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index 40f2b02..11c11c4 100755 ---- a/configure -+++ b/configure -@@ -849,20 +849,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch deleted file mode 100644 index 2c4fa20bba..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/22] Disable mkv8snapshot - -It seems to generate code that throws SIGILL, so disabling it - -Program received signal SIGILL, Illegal instruction. -0x26312c60 in ?? () -(gdb) bt - function=..., receiver=..., argc=1978934572, args=0x7efff254, - has_pending_exception=0x7efff277, qml=...) - at ../3rdparty/v8/src/execution.cc:125 - argc=1, argv=0x7efff254, pending_exception=0x7efff277, - convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 - receiver=, argc=, argv=, - pending_exception=0x7efff277, convert_receiver=false) - at ../3rdparty/v8/src/execution.cc:161 - data=, exc=0x7efff277) - at ../3rdparty/v8/src/execution.cc:734 - at ../3rdparty/v8/src/api.cc:4742 - at qml/v8/qv8contextwrapper.cpp:155 - ownership=) at qml/v8/qv8engine.cpp:155 - parent=) at qml/v8/qjsengine.cpp:192 - -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 11c11c4..521e374 100755 ---- a/configure -+++ b/configure -@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" - CFG_COMPILE_EXAMPLES=yes - CFG_RELEASE_QMAKE=no - CFG_AUDIO_BACKEND=auto --CFG_V8SNAPSHOT=auto -+CFG_V8SNAPSHOT=no - CFG_QML_DEBUG=yes - CFG_JAVASCRIPTCORE_JIT=auto - CFG_PKGCONFIG=auto --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch deleted file mode 100644 index 56b4a66343..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/22] enables tslib device to be read from env variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -from : -https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch - -Signed-off-by: Eric Bénard -Signed-off-by: Martin Jansa ---- - src/plugins/generic/tslib/qtslib.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp -index 6986fd5..2ed4a69 100644 ---- a/src/plugins/generic/tslib/qtslib.cpp -+++ b/src/plugins/generic/tslib/qtslib.cpp -@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, - qDebug() << "QTsLibMouseHandler" << key << specification; - setObjectName(QLatin1String("TSLib Mouse Handler")); - -- QByteArray device = "/dev/input/event1"; -+ QByteArray device = qgetenv("TSLIB_TSDEVICE"); -+ if(device.isEmpty()) -+ device = "/dev/input/event1"; - if (specification.startsWith("/dev/")) - device = specification.toLocal8Bit(); - --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch deleted file mode 100644 index 59c9466929..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 52172f09d646949c32f7b70188f1ffc779adbdef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/22] qtbase: allow build of examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this revert the following commit : - -commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 -Author: Oswald Buddenhagen -Date: Fri Dec 21 19:36:12 2012 +0100 - - do not actually build examples in production builds - - -developer-build enables an actual build of examples, based on the - assumption that developers want to test it (it can be still disabled - with -nomake examples). regular users otoh want only the examples - sources installed. - - Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 - Reviewed-by: Joerg Bornemann - -Signed-off-by: Eric Bénard ---- - mkspecs/features/qt_example_installs.prf | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 2db752c..ca1b0c7 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - allfiles -= doc - !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") - } -- -- !equals(TEMPLATE, subdirs):!compile_examples { -- TEMPLATE = aux -- CONFIG -= have_target qt staticlib dll -- SOURCES = -- INSTALLS -= target -- } - } --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch deleted file mode 100644 index add3e25a7b..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch +++ /dev/null @@ -1,154 +0,0 @@ -From cc2bdb0bbbbeb4eb630d82b7274d13922eb06da2 Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 16/22] 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 | 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 78f5080..20db620 100644 ---- a/src/gui/opengl/qopenglpaintengine.cpp -+++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -2004,7 +2004,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; -@@ -2092,7 +2095,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(); -@@ -2135,6 +2138,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); - } -@@ -2143,14 +2147,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 7d49c03..d9eb3fe 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); - - 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.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch deleted file mode 100644 index e17e5ac94b..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH 17/22] Use BGRA extension in bindTexture - -Upstream-Status: Pending - -Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 - -Signed-off-by: Martin Jansa ---- - src/gui/opengl/qopengltexturecache.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 94b8288..5c8aa3c 100644 ---- a/src/gui/opengl/qopengltexturecache.cpp -+++ b/src/gui/opengl/qopengltexturecache.cpp -@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con - - QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); - -- // Performance could be improved by skipping qgl_byteSwapImage(). -- if (m_useByteSwapImage) -- qgl_byteSwapImage(tx); -- -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); -+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); - - int cost = tx.width() * tx.height() * 4 / 1024; - m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch deleted file mode 100644 index eaa3ae67c6..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0bc48cdb5e3556a96320ea963d2e031b0810d0d4 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 18/22] configure: make pulseaudio a configurable option - -Allows disabling pulseaudio support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 521e374..896e012 100755 ---- a/configure -+++ b/configure -@@ -2039,6 +2039,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.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch deleted file mode 100644 index c01f635b3c..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 19 Jul 2013 23:21:28 +0200 -Subject: [PATCH 19/22] configure: make alsa a configurable option - -Allows disabling alsa support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 896e012..3470b32 100755 ---- a/configure -+++ b/configure -@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch deleted file mode 100644 index 9cec921ff9..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 98201094967e2e4224c394d0c92c0be7d39582a6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 20 Jul 2013 10:56:37 +0200 -Subject: [PATCH 20/22] configure: make freetype a configurable option - -Allows disabling freetype support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 3470b32..b0ec977 100755 ---- a/configure -+++ b/configure -@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ freetype) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then -+ CFG_LIBFREETYPE="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.1 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch deleted file mode 100644 index 0d5330599d..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Tue, 8 Oct 2013 15:45:42 +0200 -Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary - -Task-number: QTBUG-31579 - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578] -Signed-off-by: Jonathan Liu - -Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e -Reviewed-by: Gunnar Sletta ---- - src/gui/painting/qcosmeticstroker.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp -index 39f6422..a2301e3 100644 ---- a/src/gui/painting/qcosmeticstroker.cpp -+++ b/src/gui/painting/qcosmeticstroker.cpp -@@ -305,6 +305,7 @@ void QCosmeticStroker::setup() - ymax = deviceRect.bottom() + 2; - - lastPixel.x = -1; -+ lastPixel.y = -1; - } - - // returns true if the whole line gets clipped away -@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) - QPointF p = QPointF(points[0], points[1]) * state->matrix; - patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; -+ lastPixel.y = -1; - - bool closed; - const QPainterPath::ElementType *e = subPath(type, end, points, &closed); -@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) - QPointF movedTo = p; - patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; -+ lastPixel.y = -1; - - const qreal *begin = points; - const qreal *end = points + 2*path.elementCount(); --- -1.8.4 - diff --git a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch deleted file mode 100644 index d5e082ea78..0000000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 23 Oct 2013 00:28:17 +1100 -Subject: [PATCH] Fix misaligned selection region with text when centered - -If the text is centered, the x/y position in the selection QRectF may -be a multiple of 0.5 which is rounded up. This rounding causes -misalignment of the selection region with the text. - -The alignment is fixed by using qFloor on the x and y components. - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-34218 -Task-number: QTBUG-34234 -Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f -Reviewed-by: Gunnar Sletta ---- - src/gui/text/qtextlayout.cpp | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp -index 54d337e..66341e1 100644 ---- a/src/gui/text/qtextlayout.cpp -+++ b/src/gui/text/qtextlayout.cpp -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo - continue; - } - -- if (lastSelectionWidth > 0) -- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); -+ if (lastSelectionWidth > 0) { -+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); -+ rect.moveLeft(qFloor(rect.left())); -+ rect.moveTop(qFloor(rect.top())); -+ region->addRect(rect); -+ } - - lastSelectionX = selectionX; - lastSelectionWidth = selectionWidth; - } - } -- if (lastSelectionWidth > 0) -- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); -+ if (lastSelectionWidth > 0) { -+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); -+ rect.moveLeft(qFloor(rect.left())); -+ rect.moveTop(qFloor(rect.top())); -+ region->addRect(rect); -+ } - } - - static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) -@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q - - QBrush bg = chf.background(); - if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool()) -- p->fillRect(r, bg); -+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg); - if (c.style() != Qt::NoBrush) { - p->setPen(QPen(c, 0)); - } --- -1.8.4 - diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch deleted file mode 100644 index e02815b1fc..0000000000 --- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] 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. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/src.pro b/src/src.pro -index b4c9602..f30ec1f 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions - src_plugins.depends += src_gui src_platformsupport - !contains(QT_CONFIG, no-widgets) { -- SUBDIRS += src_tools_uic src_widgets -+ SUBDIRS += src_widgets - src_plugins.depends += src_widgets - contains(QT_CONFIG, opengl(es1|es2)?) { - SUBDIRS += src_opengl -@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - } - } - } --SUBDIRS += src_plugins src_tools_qdoc -+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic - - nacl: SUBDIRS -= src_network src_testlib - --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index ccb8a093a7..0000000000 --- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/23] 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]. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 3 +-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 4e12d3d..e20ad9d 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS]/$$2 - } - exists($$eval($$1).pl) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 83ef3a0..21c9eb7 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -15,8 +15,7 @@ CONFIG += console - - # 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):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { - isEmpty(MODULE):MODULE = $$TARGET - - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index 7bd2ba6bab..0000000000 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/23] 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 25980c0..74f9e65 100755 ---- a/configure -+++ b/configure -@@ -4022,7 +4022,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.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index d074c3da39..0000000000 --- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/23] 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 a81d0cd..ed7aebf 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -8,6 +8,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.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 4562fe15ee..0000000000 --- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending ---- - 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 c752df3..0d1bca6 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index f855292c09..0000000000 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement - -* 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 7f7de85..7741b96 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -140,18 +140,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - } - - unix { - CONFIG += create_libtool explicitlib -- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace - } - - unix|win32-g++* { --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index c1e80bc276..0000000000 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/23] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 7741b96..3874067 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -144,17 +144,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index 749edeee53..0000000000 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/23] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 2ec064f..847d0f7 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES - wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES - wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES - wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code - - qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) -@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS - qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands -+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-header - - qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES - qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp - qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands -+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-code - - qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} -@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS - qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands -+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-header - - qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES - qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp - qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands -+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-code --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index e0a216673a..0000000000 --- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/23] 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 - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index b4569df..d189e50 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # 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) --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch deleted file mode 100644 index 32982662a2..0000000000 --- a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/23] Disable mkv8snapshot - -It seems to generate code that throws SIGILL, so disabling it - -Program received signal SIGILL, Illegal instruction. -0x26312c60 in ?? () -(gdb) bt - function=..., receiver=..., argc=1978934572, args=0x7efff254, - has_pending_exception=0x7efff277, qml=...) - at ../3rdparty/v8/src/execution.cc:125 - argc=1, argv=0x7efff254, pending_exception=0x7efff277, - convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194 - receiver=, argc=, argv=, - pending_exception=0x7efff277, convert_receiver=false) - at ../3rdparty/v8/src/execution.cc:161 - data=, exc=0x7efff277) - at ../3rdparty/v8/src/execution.cc:734 - at ../3rdparty/v8/src/api.cc:4742 - at qml/v8/qv8contextwrapper.cpp:155 - ownership=) at qml/v8/qv8engine.cpp:155 - parent=) at qml/v8/qjsengine.cpp:192 - -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 7a9a77c..69e30b5 100755 ---- a/configure -+++ b/configure -@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" - CFG_COMPILE_EXAMPLES=auto - CFG_RELEASE_QMAKE=no - CFG_AUDIO_BACKEND=auto --CFG_V8SNAPSHOT=auto -+CFG_V8SNAPSHOT=no - CFG_QML_DEBUG=yes - CFG_JAVASCRIPTCORE_JIT=auto - CFG_PKGCONFIG=auto --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch deleted file mode 100644 index 5919bbadab..0000000000 --- a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001 -From: Jani Hautakangas -Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH 20/23] Use BGRA extension in bindTexture - -Upstream-Status: Pending - -Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 - -Signed-off-by: Martin Jansa ---- - src/gui/opengl/qopengltexturecache.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 94b8288..5c8aa3c 100644 ---- a/src/gui/opengl/qopengltexturecache.cpp -+++ b/src/gui/opengl/qopengltexturecache.cpp -@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con - - QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); - -- // Performance could be improved by skipping qgl_byteSwapImage(). -- if (m_useByteSwapImage) -- qgl_byteSwapImage(tx); -- -- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast(tx).bits()); -+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast(tx).bits()); - - int cost = tx.width() * tx.height() * 4 / 1024; - m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch deleted file mode 100644 index f259284ceb..0000000000 --- a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Tue, 28 Feb 2012 15:10:24 +0000 -Subject: [PATCH 21/23] configure: make pulseaudio a configurable option - -Allows disabling pulseaudio support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 69e30b5..290b9ac 100755 ---- a/configure -+++ b/configure -@@ -2039,6 +2039,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.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch deleted file mode 100644 index 3513a171d3..0000000000 --- a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 19 Jul 2013 23:21:28 +0200 -Subject: [PATCH 22/23] configure: make alsa a configurable option - -Allows disabling alsa support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 290b9ac..5e9bfd4 100755 ---- a/configure -+++ b/configure -@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch deleted file mode 100644 index f141725fb7..0000000000 --- a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 20 Jul 2013 10:56:37 +0200 -Subject: [PATCH 23/23] configure: make freetype a configurable option - -Allows disabling freetype support at configure time. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - configure | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure b/configure -index 5e9bfd4..5b1f5f2 100755 ---- a/configure -+++ b/configure -@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ freetype) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then -+ CFG_LIBFREETYPE="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - gtkstyle) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QGTKSTYLE="$VAL" --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch deleted file mode 100644 index 7ca5e80886..0000000000 --- a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to - host binaries - -Upstream-Status: Inappropiate (configuration) - -Signed-off-by: Simon Busch ---- - src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- - src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a804278..b6fbbea 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..3209e42 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 e5650ff..7fb8b21 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}) - --- -1.8.1.2 - diff --git a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch deleted file mode 100644 index 6858cead49..0000000000 --- a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af96c6fed931564c95037539f07e9c8e33c69529 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,61698] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-32534 -Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 -Reviewed-by: Jonathan Liu -Reviewed-by: Shane Kearns ---- - src/network/access/qhttpmultipart.cpp | 3 +- - .../access/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 4397ef8..5985ed9 100644 ---- a/src/network/access/qhttpmultipart.cpp -+++ b/src/network/access/qhttpmultipart.cpp -@@ -497,7 +497,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-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch deleted file mode 100644 index 0d5330599d..0000000000 --- a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Tue, 8 Oct 2013 15:45:42 +0200 -Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary - -Task-number: QTBUG-31579 - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578] -Signed-off-by: Jonathan Liu - -Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e -Reviewed-by: Gunnar Sletta ---- - src/gui/painting/qcosmeticstroker.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp -index 39f6422..a2301e3 100644 ---- a/src/gui/painting/qcosmeticstroker.cpp -+++ b/src/gui/painting/qcosmeticstroker.cpp -@@ -305,6 +305,7 @@ void QCosmeticStroker::setup() - ymax = deviceRect.bottom() + 2; - - lastPixel.x = -1; -+ lastPixel.y = -1; - } - - // returns true if the whole line gets clipped away -@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) - QPointF p = QPointF(points[0], points[1]) * state->matrix; - patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; -+ lastPixel.y = -1; - - bool closed; - const QPainterPath::ElementType *e = subPath(type, end, points, &closed); -@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) - QPointF movedTo = p; - patternOffset = state->lastPen.dashOffset()*64; - lastPixel.x = -1; -+ lastPixel.y = -1; - - const qreal *begin = points; - const qreal *end = points + 2*path.elementCount(); --- -1.8.4 - diff --git a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch deleted file mode 100644 index d5e082ea78..0000000000 --- a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 23 Oct 2013 00:28:17 +1100 -Subject: [PATCH] Fix misaligned selection region with text when centered - -If the text is centered, the x/y position in the selection QRectF may -be a multiple of 0.5 which is rounded up. This rounding causes -misalignment of the selection region with the text. - -The alignment is fixed by using qFloor on the x and y components. - -Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842] -Signed-off-by: Jonathan Liu - -Task-number: QTBUG-34218 -Task-number: QTBUG-34234 -Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f -Reviewed-by: Gunnar Sletta ---- - src/gui/text/qtextlayout.cpp | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp -index 54d337e..66341e1 100644 ---- a/src/gui/text/qtextlayout.cpp -+++ b/src/gui/text/qtextlayout.cpp -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo - continue; - } - -- if (lastSelectionWidth > 0) -- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); -+ if (lastSelectionWidth > 0) { -+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); -+ rect.moveLeft(qFloor(rect.left())); -+ rect.moveTop(qFloor(rect.top())); -+ region->addRect(rect); -+ } - - lastSelectionX = selectionX; - lastSelectionWidth = selectionWidth; - } - } -- if (lastSelectionWidth > 0) -- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight)); -+ if (lastSelectionWidth > 0) { -+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight); -+ rect.moveLeft(qFloor(rect.left())); -+ rect.moveTop(qFloor(rect.top())); -+ region->addRect(rect); -+ } - } - - static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) -@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q - - QBrush bg = chf.background(); - if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool()) -- p->fillRect(r, bg); -+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg); - if (c.style() != Qt::NoBrush) { - p->setPen(QPen(c, 0)); - } --- -1.8.4 - diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 1adf422eb3..b9193e4ea2 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -7,28 +7,24 @@ QT_MODULE = "qtbase" require qt5-native.inc -# shared with target qtbase, all except -# 0005-qmake-is-already-built-in-qtbase-native.patch -# 0006-Allow-building-a-separate-qmake-for-the-target.patch - -SRC_URI += " \ +# common with target version +# common with -native and target version +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_functions-temporary-remove-isEmpty-check.patch \ - file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0008-qt_module-Fix-pkgconfig-replacement.patch \ - file://0009-qt_module-Fix-paths-in-.prl-files.patch \ - file://0010-wayland-scanner-disable-silent-rules.patch \ - file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ - file://0013-Disable-mkv8snapshot.patch \ - file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ - file://0015-qtbase-allow-build-of-examples.patch \ + file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0005-qt_module-Fix-pkgconfig-replacement.patch \ + file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ + file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ " # specific for native version -SRC_URI += "file://0001-Always-build-uic.patch" +SRC_URI += " \ + file://0010-Always-build-uic.patch \ +" QT_CONF_PATH = "${B}/qt.conf" diff --git a/recipes-qt/qt5/qtbase-native_5.1.1.bb b/recipes-qt/qt5/qtbase-native_5.2.0.bb similarity index 63% rename from recipes-qt/qt5/qtbase-native_5.1.1.bb rename to recipes-qt/qt5/qtbase-native_5.2.0.bb index 612553c655..8ccd16df50 100644 --- a/recipes-qt/qt5/qtbase-native_5.1.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.2.0.bb @@ -7,5 +7,5 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" -SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" +SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" +SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 96e7c29883..ce823d26e0 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,10 +1,31 @@ require qt5-git.inc require ${PN}.inc +# common with target version +SRC_URI = "\ + git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + 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_functions-temporary-remove-isEmpty-check.patch \ + file://0005-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0006-qt_module-Fix-pkgconfig-replacement.patch \ + file://0007-qt_module-Fix-paths-in-.prl-files.patch \ + file://0008-wayland-scanner-disable-silent-rules.patch \ + file://0009-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0010-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0011-configure-make-pulseaudio-a-configurable-option.patch \ + file://0012-configure-make-alsa-a-configurable-option.patch \ + file://0013-configure-make-freetype-a-configurable-option.patch \ + file://0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ +" + +SRC_URI += "file://0015-Always-build-uic.patch" + do_install_append() { # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" +SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index ffb37ce43b..cd3a939cd0 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,29 +1,24 @@ require qt5.inc -SRC_URI += " \ +# common with -native +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_functions-temporary-remove-isEmpty-check.patch \ - file://0005-qmake-is-already-built-in-qtbase-native.patch \ - file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0008-qt_module-Fix-pkgconfig-replacement.patch \ - file://0009-qt_module-Fix-paths-in-.prl-files.patch \ - file://0010-wayland-scanner-disable-silent-rules.patch \ - file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ - file://0013-Disable-mkv8snapshot.patch \ + file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0005-qt_module-Fix-pkgconfig-replacement.patch \ + file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ + file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ +" + +SRC_URI += "\ + file://0010-qmake-is-already-built-in-qtbase-native.patch \ + file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0012-qtbase-allow-build-of-examples.patch \ + file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ - file://0015-qtbase-allow-build-of-examples.patch \ - file://0018-QOpenGLPaintDevice-sub-area-support.patch \ - file://0020-Use-BGRA-extension-in-bindTexture.patch \ - file://0021-configure-make-pulseaudio-a-configurable-option.patch \ - file://0022-configure-make-alsa-a-configurable-option.patch \ - file://0023-configure-make-freetype-a-configurable-option.patch \ - file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ - file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \ - file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch similarity index 95% rename from recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch rename to recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 5c16ece59c..0976c34302 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001 +From f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/23] Add linux-oe-g++ platform +Subject: [PATCH 01/14] 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 @@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 938b23b..dacfd30 100755 +index a330dd6..1b328ae 100755 --- a/configure +++ b/configure -@@ -291,6 +291,16 @@ getQMakeConf() +@@ -324,6 +324,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -61,7 +61,7 @@ index 938b23b..dacfd30 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -300,6 +310,16 @@ getXQMakeConf() +@@ -333,6 +343,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -78,7 +78,7 @@ index 938b23b..dacfd30 100755 compilerSupportsFlag() { cat >conftest.cpp <> "$mkfile" } @@ -130,7 +130,7 @@ index 938b23b..dacfd30 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -4005,11 +4045,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch similarity index 82% rename from recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch rename to recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 9f301c4636..afc25cc4ba 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001 +From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/14] 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 @@ -16,10 +16,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 53a3ebb..8ca2102 100644 +index 1c3b09f..c647a16 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() +@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() { @@ -32,5 +32,5 @@ index 53a3ebb..8ca2102 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch similarity index 73% rename from recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch rename to recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index b80189f375..3f7854fda1 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,50 +1,55 @@ -From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001 +From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/23] Add -external-hostbindir option +Subject: [PATCH 03/14] 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]. + Upstream-Status: Pending Signed-off-by: Martin Jansa --- - configure | 14 ++++++++++++++ - mkspecs/features/qt_functions.prf | 5 ++++- - mkspecs/features/qt_tool.prf | 2 +- + configure | 15 +++++++++++++++ + mkspecs/features/qt_functions.prf | 9 ++++++++- + mkspecs/features/qt_tool.prf | 3 +-- qmake/property.cpp | 1 + qtbase.pro | 12 +++++++++--- src/corelib/global/qlibraryinfo.cpp | 3 ++- src/corelib/global/qlibraryinfo.h | 1 + tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 40 insertions(+), 6 deletions(-) + 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/configure b/configure -index dacfd30..25980c0 100755 +index 1b328ae..46f7230 100755 --- a/configure +++ b/configure -@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= - QT_HOST_BINS= +@@ -785,6 +785,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= + QT_EXT_PREFIX= +QT_EXTERNAL_HOST_BINS= #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do +@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ + -external-hostbindir| \ -hostlibdir| \ + -extprefix| \ -sysroot| \ - -depths| \ -@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do - hostlibdir) - QT_HOST_LIBS="$VAL" +@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do + extprefix) + QT_EXT_PREFIX="$VAL" ;; + external-hostbindir) + QT_EXTERNAL_HOST_BINS="$VAL" @@ -52,29 +57,30 @@ index dacfd30..25980c0 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" - fi - -+# 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 -+ - #------------------------------------------------------------------------------- - # help - interactive parts of the script _after_ this section please - #------------------------------------------------------------------------------- -@@ -3416,6 +3426,9 @@ Installation options: +@@ -2226,6 +2231,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 -@@ -3931,6 +3944,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3133,6 +3142,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 +@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", @@ -83,36 +89,41 @@ index dacfd30..25980c0 100755 "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 2f2c94c..4e12d3d 100644 +index 1dacfed..7229845 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { +@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { - $$1 = $$[QT_HOST_BINS]/$$2 + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } exists($$eval($$1).pl) { $$1 = perl -w $$eval($$1).pl } else: contains(QMAKE_HOST.os, Windows) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 9a6b963..83ef3a0 100644 +index f0864f9..50bfac8 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf -@@ -16,7 +16,7 @@ CONFIG += console +@@ -15,8 +15,7 @@ CONFIG += console + # 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. +-# 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]) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) diff --git a/qmake/property.cpp b/qmake/property.cpp -index 4685440..93eb1d4 100644 +index e50485c..71291ad 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -75,6 +75,7 @@ static const struct { @@ -124,7 +135,7 @@ index 4685440..93eb1d4 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index d6726b5..28ca7d5 100644 +index 7576db7..d51af0e 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -70,16 +70,22 @@ CONFIG -= qt @@ -154,10 +165,10 @@ index d6726b5..28ca7d5 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 8ca2102..9f5d444 100644 +index c647a16..da82913 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() +@@ -281,7 +281,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -166,7 +177,7 @@ index 8ca2102..9f5d444 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -296,6 +296,7 @@ static const struct { +@@ -307,6 +307,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." }, @@ -175,7 +186,7 @@ index 8ca2102..9f5d444 100644 { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index b275e01..0e6baed 100644 +index 17864b5..a14bc0f 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -84,6 +84,7 @@ public: @@ -187,11 +198,11 @@ index b275e01..0e6baed 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 5b62e8f..c752df3 100644 +index e2fef2c..ab475c3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() - dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); +@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() + dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } + else if (configCmdLine.at(i) == "-external-hostbindir") { @@ -204,7 +215,7 @@ index 5b62e8f..c752df3 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp() +@@ -3852,6 +3859,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl @@ -213,5 +224,5 @@ index 5b62e8f..c752df3 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 0000000000..71a4596978 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,29 @@ +From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Upstream-Status: Pending +--- + 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 ab475c3..68cd43d 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3213,8 +3213,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; + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) +-- +1.8.5.2 + diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 0000000000..f85fb33b23 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,117 @@ +From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement +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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +Signed-off-by: Andreas Müller +--- + mkspecs/features/qt_module.prf | 43 ++++++++++++++++++++++++++++++------------ + 1 file changed, 31 insertions(+), 12 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 11509ee..2f95684 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -135,30 +135,49 @@ load(qt_installs) + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +-include_replace.match = $$rplbase/include +-include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +-include_replace.CONFIG = path +-lib_replace.match = $$rplbase/lib +-host_build: \ +- lib_replace.replace = $$[QT_HOST_LIBS] +-else: \ ++pkgconfig_include_replace.match = $$rplbase/include ++pkgconfig_include_replace.replace = "\$$\\{includedir}" ++pkgconfig_lib_replace.match = $$rplbase/lib ++pkgconfig_lib_replace.replace = "\$$\\{libdir}" ++!exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ include_replace.CONFIG = path ++ lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +-lib_replace.CONFIG = path ++ lib_replace.CONFIG = path ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++} else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ include_replace.CONFIG = path ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.CONFIG = path ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++} + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + + unix|win32-g++* { + CONFIG += create_pc +- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace +- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace ++ host_build: \ ++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] ++ else: \ ++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace + } + + unix|win32-g++* { +-- +1.8.5.2 + diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch similarity index 78% rename from recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch rename to recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 6117e7fb86..82e028d7b2 100644 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ -From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001 +From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 06/14] 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 @@ -10,14 +10,14 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa --- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) + configure | 14 -------------- + 1 file changed, 14 deletions(-) diff --git a/configure b/configure -index 74f9e65..7a9a77c 100755 +index 46f7230..96c56c8 100755 --- a/configure +++ b/configure -@@ -849,20 +849,7 @@ fi'` +@@ -581,20 +581,6 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" @@ -35,10 +35,9 @@ index 74f9e65..7a9a77c 100755 -fi'` - eval "$cmd" -done -+ # Use CC/CXX to run config.tests mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch similarity index 86% rename from recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch rename to recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch index b6c3ae31b1..b2b5ef9c26 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ -From b4f8c636cb265951979868a65006ce49f442e5e7 Mon Sep 17 00:00:00 2001 +From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/22] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 07/14] 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 @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index b4569df..d189e50 100644 +index 39144e7..de48b07 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { +@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" # Clean up after previous run @@ -33,5 +33,5 @@ index b4569df..d189e50 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.3.1 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch new file mode 100644 index 0000000000..eea0c343c2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch @@ -0,0 +1,49 @@ +From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a + configurable option + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton +Signed-off-by: Martin Jansa +--- + configure | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/configure b/configure +index 96c56c8..b3854aa 100755 +--- a/configure ++++ b/configure +@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ pulseaudio) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_PULSEAUDIO="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; ++ alsa) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then ++ CFG_ALSA="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; ++ freetype) ++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then ++ CFG_LIBFREETYPE="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" +-- +1.8.5.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch similarity index 93% rename from recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch rename to recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch index 70c0c0e09c..b35597b79c 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch +++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch @@ -1,12 +1,13 @@ -From b4d383bf47374c7132ecbcaec2c6aea31f858f54 Mon Sep 17 00:00:00 2001 +From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 -Subject: [PATCH 21/22] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path - to host binaries +Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to + determine path to host binaries Upstream-Status: Inappropiate (configuration) Signed-off-by: Simon Busch +Signed-off-by: Martin Jansa --- src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- @@ -14,7 +15,7 @@ Signed-off-by: Simon Busch 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e01b448..5382730 100644 +index 1e00c74..a99b5bf 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -80,5 +81,5 @@ index e5650ff..16ff007 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -1.8.3.1 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch new file mode 100644 index 0000000000..91370f172d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch @@ -0,0 +1,38 @@ +From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH 10/12] 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. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index b7887a6..8801544 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + } + } + } +-SUBDIRS += src_plugins src_tools_qdoc ++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + +@@ -156,4 +156,4 @@ TR_EXCLUDE = \ + src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml + + sub-tools.depends = $$TOOLS +-QMAKE_EXTRA_TARGETS = sub-tools +\ No newline at end of file ++QMAKE_EXTRA_TARGETS = sub-tools +-- +1.8.5.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch similarity index 74% rename from recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch rename to recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch index 1f5b62dc88..1b1d85e335 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From 777d4bfc7a94256ec46f61bd80bc6058cdf55ebb Mon Sep 17 00:00:00 2001 +From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/22] qmake is already built in qtbase-native +Subject: [PATCH 10/14] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 39a5deb..40f2b02 100755 +index b3854aa..15c89c7 100755 --- a/configure +++ b/configure -@@ -4014,7 +4014,7 @@ setBootstrapEvalVariable() +@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index 39a5deb..40f2b02 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.3.1 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch similarity index 51% rename from recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch rename to recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch index 56b0fdd453..65b65aa733 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From c36477f621c7d682ee7140156127ad32e91a40ad Mon Sep 17 00:00:00 2001 +From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/22] Allow building a separate qmake for the target +Subject: [PATCH 11/14] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -9,21 +9,22 @@ Signed-off-by: Paul Eggleton Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) + qmake/qmake.pro | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index a81d0cd..ed7aebf 100644 +index 89d6ea5..7c605b9 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ - PROEVALUATOR_FULL PROEVALUATOR_DEBUG - DESTDIR = ../bin/ +@@ -8,6 +8,8 @@ CONFIG -= qt + DEFINES += \ + QT_BUILD_QMAKE \ + PROEVALUATOR_FULL ++DESTDIR = ../bin/ +TARGET = qmake - OBJECTS_DIR = . - MOC_DIR = . + VPATH += \ + ../src/corelib/global \ -- -1.8.3.1 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch similarity index 71% rename from recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch rename to recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch index 048eab769e..9335610d0c 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch @@ -1,7 +1,8 @@ -From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:00 2001 +From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH] configure: preserve built qmake and swap with native one +Subject: [PATCH 11/12] configure: preserve built qmake and swap with native + one Let configure script build the real qmake, but right after it's built, swap it with a native qmake for further internal use, preserving the real one. @@ -12,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 140c7b4..304d30f 100755 +index b3854aa..20836a6 100755 --- a/configure +++ b/configure -@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake @@ -25,5 +26,5 @@ index 140c7b4..304d30f 100755 echo "Running configuration tests..." -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch similarity index 66% rename from recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch rename to recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch index 3b312b6706..d235797d07 100644 --- a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch @@ -1,7 +1,7 @@ -From 9500744fee36c908d0cb7e034f8c8dd3dd1c4fa4 Mon Sep 17 00:00:00 2001 +From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH] configure: bump path length from 256 to 512 characters +Subject: [PATCH 12/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. @@ -12,18 +12,18 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 304d30f..a37a587 100755 +index 20836a6..50661f4 100755 --- a/configure +++ b/configure -@@ -3870,7 +3870,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3805,7 +3805,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] = { - "qt_prfxpath=$QT_INSTALL_PREFIX", - "qt_docspath=$QT_INSTALL_DOCS", - "qt_hdrspath=$QT_INSTALL_HEADERS", + #ifndef QT_BUILD_QMAKE + "qt_prfxpath=$QT_SYSROOT_PREFIX", + "qt_docspath=$QT_SYSROOT_DOCS", -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch similarity index 92% rename from recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch rename to recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch index 9cf0641984..591be8e5fc 100644 --- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ -From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001 +From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/23] qtbase: allow build of examples +Subject: [PATCH 12/14] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 - } } -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch similarity index 89% rename from recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch rename to recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch index e26d237fd6..9bef55afde 100644 --- a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From b485950725b776bc1f0cf4edd5330d61732262cb Mon Sep 17 00:00:00 2001 +From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support +Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa 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 +index fa392d1..5df1762 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate @@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644 void setSize(const QSize &size); void setDevicePixelRatio(qreal devicePixelRatio); diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 78f5080..20db620 100644 +index 0513551..f6aeb15 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -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; @@ -90,7 +90,7 @@ index 78f5080..20db620 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -99,7 +99,7 @@ index 78f5080..20db620 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -107,7 +107,7 @@ index 78f5080..20db620 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -137,10 +137,10 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 7d49c03..d9eb3fe 100644 +index 3b62d1d..a5d1f7e 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) +@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { @@ -150,5 +150,5 @@ index 7d49c03..d9eb3fe 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch similarity index 89% rename from recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch rename to recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch index a2dc5fb83e..5b5d18f051 100644 --- a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ -From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001 +From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/23] enables tslib device to be read from env variable +Subject: [PATCH 14/14] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.3.2 +1.8.5.2 diff --git a/recipes-qt/qt5/qtbase_5.1.1.bb b/recipes-qt/qt5/qtbase_5.1.1.bb deleted file mode 100644 index 8fd161a8e1..0000000000 --- a/recipes-qt/qt5/qtbase_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" -SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" diff --git a/recipes-qt/qt5/qtbase_5.2.0.bb b/recipes-qt/qt5/qtbase_5.2.0.bb new file mode 100644 index 0000000000..aca8dea09f --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" +SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 30d5b237c0..bd8a6f6953 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch" - -SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" +SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 334ae3534f..4373e5eae1 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${BPN}.inc -SRCREV = "c21addb23f2eb67dc55853b115e5b735df065891" +SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953" diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index d355e4880c..0000000000 --- a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= -Date: Wed, 5 Jun 2013 19:23:32 +0200 -Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions - -Viewport is calculated wrong for horizontal layout in a second instance - -Task-number: QTBUG-29944 -Task-Number: QTBUG-31546 - -Upstream-Status: Pending - -Looks like backport of https://codereview.qt-project.org/49226 but this -one was applied in previous patch, this change looks the same but is -in different part of qquickitemview.cpp and ISN'T applied yet in dev -branch. - -Signed-off-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe ---- - src/quick/items/qquickitemview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index a6dabee..290f283 100644 ---- a/src/quick/items/qquickitemview.cpp -+++ b/src/quick/items/qquickitemview.cpp -@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() - - prepareVisibleItemTransitions(); - -- QRectF viewBounds(0, position(), q->width(), q->height()); -+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); - for (QList::Iterator it = releasePendingTransition.begin(); - it != releasePendingTransition.end(); ) { - FxViewItem *item = *it; --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch deleted file mode 100644 index 7a68dd53e9..0000000000 --- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sun, 26 May 2013 14:26:19 +0200 -Subject: [PATCH 1/3] qmltestexample: fix link -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -else we get : -ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found - -Upstream-Status: Inappropriate - -Signed-off-by: Eric Bénard ---- - examples/qmltest/qmltest/qmltest.pro | 2 +- - tools/qmltestrunner/qmltestrunner.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro -index b5893c5..1b00e6c 100644 ---- a/examples/qmltest/qmltest/qmltest.pro -+++ b/examples/qmltest/qmltest/qmltest.pro -@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml - # This code exists solely for the purpose of building this example - # inside the examples/ hierarchy. - --QT += qml qmltest -+QT += qml qmltest quick - - macx: CONFIG -= app_bundle - -diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro -index 5184c1f..668cf17 100644 ---- a/tools/qmltestrunner/qmltestrunner.pro -+++ b/tools/qmltestrunner/qmltestrunner.pro -@@ -1,5 +1,5 @@ - SOURCES += main.cpp - --QT += qml qmltest -+QT += qml qmltest quick - - load(qt_tool) --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 6569c69e9d..12e650fae2 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,3 +1,8 @@ require qt5.inc -DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ +" + +DEPENDS += "qtsvg qtxmlpatterns" diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch rename to recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch diff --git a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch similarity index 100% rename from recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch rename to recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch diff --git a/recipes-qt/qt5/qtdeclarative_5.1.1.bb b/recipes-qt/qt5/qtdeclarative_5.1.1.bb deleted file mode 100644 index be724691de..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.1.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += " \ - file://0001-qmltestexample-fix-link.patch \ - file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ -" - -SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c" -SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31" - -# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ -" diff --git a/recipes-qt/qt5/qtdeclarative_5.2.0.bb b/recipes-qt/qt5/qtdeclarative_5.2.0.bb new file mode 100644 index 0000000000..a88f50f2e3 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202" +SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 407dd886b6..9190800c73 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,9 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRC_URI += " \ - file://0001-qmltestexample-fix-link.patch \ - file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ -" - -SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c" +SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb deleted file mode 100644 index 311f11342d..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "40d0989d68fb08c1184b7d5088da9c48" -SRC_URI[sha256sum] = "347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb new file mode 100644 index 0000000000..df36dc6a65 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd" +SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 3f0f8790a3..c1bd9fad4e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2" +SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb" diff --git a/recipes-qt/qt5/qtimageformats_5.1.1.bb b/recipes-qt/qt5/qtimageformats_5.1.1.bb deleted file mode 100644 index ccb539ac5c..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "209edddd5899b36ea7ea7ad52204a593" -SRC_URI[sha256sum] = "3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4" diff --git a/recipes-qt/qt5/qtimageformats_5.2.0.bb b/recipes-qt/qt5/qtimageformats_5.2.0.bb new file mode 100644 index 0000000000..a12e5d8bcf --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55" +SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 1bb88ae0b7..856bfba7fd 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98" +SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571" diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch deleted file mode 100644 index 1f94e4cee1..0000000000 --- a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 11:20:13 -0800 -Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro -index 16beb02..5e327f7 100644 ---- a/src/tools/mkv8snapshot/mkv8snapshot.pro -+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro -@@ -24,5 +24,10 @@ unix:LIBS += -lpthread - - # We don't need to install this tool, it's only used for building v8. - # However we do have to make sure that 'make install' builds it. --dummytarget.CONFIG = dummy_install --INSTALLS += dummytarget -+#dummytarget.CONFIG = dummy_install -+#INSTALLS += dummytarget -+ -+# Install the tool so that during target cross compilation we have access to the native side binary -+target.path = $$[QT_HOST_BINS] -+INSTALLS += target -+ --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch deleted file mode 100644 index d9bb5b4399..0000000000 --- a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 02:45:01 +0200 -Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - src/v8/v8.pro | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/v8/v8.pro b/src/v8/v8.pro -index 2be6a19..d3da4e1 100644 ---- a/src/v8/v8.pro -+++ b/src/v8/v8.pro -@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. - include(v8.pri) - - contains(QT_CONFIG, v8snapshot) { -- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() -+ !exists($$mkv8snapshot.tool): \ -+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() -+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} - DUMMY_FILE = v8.pro - mkv8snapshot.input = DUMMY_FILE - mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch deleted file mode 100644 index e823b76123..0000000000 --- a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 11:20:13 -0800 -Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro -index 16beb02..5e327f7 100644 ---- a/src/tools/mkv8snapshot/mkv8snapshot.pro -+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro -@@ -24,5 +24,10 @@ unix:LIBS += -lpthread - - # We don't need to install this tool, it's only used for building v8. - # However we do have to make sure that 'make install' builds it. --dummytarget.CONFIG = dummy_install --INSTALLS += dummytarget -+#dummytarget.CONFIG = dummy_install -+#INSTALLS += dummytarget -+ -+# Install the tool so that during target cross compilation we have access to the native side binary -+target.path = $$[QT_HOST_BINS] -+INSTALLS += target -+ --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch deleted file mode 100644 index b0ac27d1e0..0000000000 --- a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 02:45:01 +0200 -Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - src/v8/v8.pro | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/v8/v8.pro b/src/v8/v8.pro -index 2be6a19..d3da4e1 100644 ---- a/src/v8/v8.pro -+++ b/src/v8/v8.pro -@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. - include(v8.pri) - - contains(QT_CONFIG, v8snapshot) { -- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} -+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix() -+ !exists($$mkv8snapshot.tool): \ -+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix() -+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT} - DUMMY_FILE = v8.pro - mkv8snapshot.input = DUMMY_FILE - mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc deleted file mode 100644 index 30663b875c..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ /dev/null @@ -1,24 +0,0 @@ -# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git -LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ -" - -DEPENDS = "qtbase-native" - -QT_MODULE = "qtjsbackend" - -require qt5-native.inc - -SRC_URI += "\ - file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ -" - -do_configure() { - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} -} diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb deleted file mode 100644 index aac7b850ee..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" -SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192" diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb deleted file mode 100644 index 29e97c499b..0000000000 --- a/recipes-qt/qt5/qtjsbackend-native_git.bb +++ /dev/null @@ -1,4 +0,0 @@ -require qt5-git.inc -require ${PN}.inc - -SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc deleted file mode 100644 index 66afc948e9..0000000000 --- a/recipes-qt/qt5/qtjsbackend.inc +++ /dev/null @@ -1,14 +0,0 @@ -require qt5.inc - -# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git -LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ -" - -DEPENDS += "qtbase qtjsbackend-native" - -SRC_URI += " \ - file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ -" diff --git a/recipes-qt/qt5/qtjsbackend_5.1.1.bb b/recipes-qt/qt5/qtjsbackend_5.1.1.bb deleted file mode 100644 index aac7b850ee..0000000000 --- a/recipes-qt/qt5/qtjsbackend_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f" -SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192" diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb deleted file mode 100644 index 29e97c499b..0000000000 --- a/recipes-qt/qt5/qtjsbackend_git.bb +++ /dev/null @@ -1,4 +0,0 @@ -require qt5-git.inc -require ${PN}.inc - -SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 66032b6aad..d5d7e844f8 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,10 +1,4 @@ require qt5-git.inc require ${PN}.inc -# qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" - -# drop when bumping SRCREV -PR = "r1" - -SRCREV = "f28408346243cf090326f4738fd838219c21e00f" +SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382" diff --git a/recipes-qt/qt5/qtmultimedia_5.1.1.bb b/recipes-qt/qt5/qtmultimedia_5.1.1.bb deleted file mode 100644 index f8b61ce403..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "4b6e74bd7752bc241617f41539632bba" -SRC_URI[sha256sum] = "df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe" diff --git a/recipes-qt/qt5/qtmultimedia_5.2.0.bb b/recipes-qt/qt5/qtmultimedia_5.2.0.bb new file mode 100644 index 0000000000..9f3f5b1a6d --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365" +SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index d1eced6cda..8ba720f1bb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c74b544610376c753ea0a29ff2465e2bcfe70e1d" +SRCREV = "ea9f9788d502d4a4307a464d87a00be198df09ad" diff --git a/recipes-qt/qt5/qtquick1_5.1.1.bb b/recipes-qt/qt5/qtquick1_5.1.1.bb deleted file mode 100644 index bc07600415..0000000000 --- a/recipes-qt/qt5/qtquick1_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "05956168e0a4bba44c31b61dd4fc5e6e" -SRC_URI[sha256sum] = "f5dc431fb33a195414d2d75d7dff1c101f4101489f38b4ea9c5e8782b1807a64" diff --git a/recipes-qt/qt5/qtquick1_5.2.0.bb b/recipes-qt/qt5/qtquick1_5.2.0.bb new file mode 100644 index 0000000000..bc3df43ff5 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "4535ff78b5a9a18ffba702298a48e22e" +SRC_URI[sha256sum] = "ae868892a586cd0622a558fda6ebada8edadb575edf3b50e5569fd7115b6e805" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 1d4a7253e8..1a83f10821 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" +SRCREV = "2866c00375313d1726cc0473b6b7bfc87b984c78" diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.1.bb b/recipes-qt/qt5/qtquickcontrols_5.1.1.bb deleted file mode 100644 index ea6c7f97dd..0000000000 --- a/recipes-qt/qt5/qtquickcontrols_5.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "6482ee0c4b11119ae5cb5080e61c18c0" -SRC_URI[sha256sum] = "52fe58cb83f7b76d46abd12485713a7bd62a3b2739a7271098e0a1ea25d9fec3" - diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb new file mode 100644 index 0000000000..99c5bc0cf4 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "748ab947f59fb104db2ac1fefa073d81" +SRC_URI[sha256sum] = "c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c" + diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index ded017bd92..76f96ea42f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c304d741a27b5822a35d1fb83f8f5e65719907ce" +SRCREV = "1d684b38a4fb0b8ce33401fa9c8f415eba6097bf" diff --git a/recipes-qt/qt5/qtscript_5.1.1.bb b/recipes-qt/qt5/qtscript_5.1.1.bb deleted file mode 100644 index d43e7891bb..0000000000 --- a/recipes-qt/qt5/qtscript_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "5c0e8633fbf560f711b7af689f8bcb99" -SRC_URI[sha256sum] = "d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364" diff --git a/recipes-qt/qt5/qtscript_5.2.0.bb b/recipes-qt/qt5/qtscript_5.2.0.bb new file mode 100644 index 0000000000..c477d9ecbf --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "37d32c983c3fdf5b29f932265046f2e3" +SRC_URI[sha256sum] = "ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 4328b583d2..fd98b67279 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a8e3602554c3225046a831cad7a727a56501439b" +SRCREV = "15bb30b0e90c628cc3812627923d1d459d461505" diff --git a/recipes-qt/qt5/qtsensors_5.1.1.bb b/recipes-qt/qt5/qtsensors_5.1.1.bb deleted file mode 100644 index a363d87221..0000000000 --- a/recipes-qt/qt5/qtsensors_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "219607895e15348d723fa67324d7061a" -SRC_URI[sha256sum] = "07f2d94964b47786a33ba1e24049c81b29e95b791647f9116ea350dc4cbc814f" diff --git a/recipes-qt/qt5/qtsensors_5.2.0.bb b/recipes-qt/qt5/qtsensors_5.2.0.bb new file mode 100644 index 0000000000..7eabd189b3 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "718606a6f76afa20c6cd2e0433356ac2" +SRC_URI[sha256sum] = "5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7d082a1d32..db5f81698d 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "0862901b142f36e91b98dbdcb2c36585020bb33d" +SRCREV = "8b501195f623fbcf31b591a1414e1726dbb7ce84" diff --git a/recipes-qt/qt5/qtserialport.inc b/recipes-qt/qt5/qtserialport.inc index bbb05a6557..d559677e35 100644 --- a/recipes-qt/qt5/qtserialport.inc +++ b/recipes-qt/qt5/qtserialport.inc @@ -1,3 +1,9 @@ require qt5.inc +# whitespace change in LGPL_EXCEPTION.txt and a bit different formating in LICENSE.LGPL +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ + file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\ +" + DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtserialport_5.1.1.bb b/recipes-qt/qt5/qtserialport_5.1.1.bb deleted file mode 100644 index 78c982a52e..0000000000 --- a/recipes-qt/qt5/qtserialport_5.1.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ - file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\ -" - -SRC_URI[md5sum] = "83bba7e8f27d6d6d5a0d2fdcb5641d7f" -SRC_URI[sha256sum] = "aee1a277b64dc70be6d7d0504e35f2df52a83b41ab65c344119e76222ceb063b" diff --git a/recipes-qt/qt5/qtserialport_5.2.0.bb b/recipes-qt/qt5/qtserialport_5.2.0.bb new file mode 100644 index 0000000000..03dae6c019 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7b90e0707b698331226e662bd39945e9" +SRC_URI[sha256sum] = "c7d5bb58d6c574275102d088159d0323aac40a639ceb4224aa06c34d2fe8d292" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb new file mode 100644 index 0000000000..af2cf22bd3 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "97bbe2acd8b4c14315653a3d9dc5757d6518220e" diff --git a/recipes-qt/qt5/qtsvg_5.1.1.bb b/recipes-qt/qt5/qtsvg_5.1.1.bb deleted file mode 100644 index 4dcb243e91..0000000000 --- a/recipes-qt/qt5/qtsvg_5.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "9db8209602b0ea942273e01a874ea5b7" -SRC_URI[sha256sum] = "6bfe7705ff58391205ca797d84ca6dda57ebcce106fdff52d4908b0e443567bf" - diff --git a/recipes-qt/qt5/qtsvg_5.2.0.bb b/recipes-qt/qt5/qtsvg_5.2.0.bb new file mode 100644 index 0000000000..e300b4c810 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.2.0.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "3f6132475f6edcd7b6cfb57650846185" +SRC_URI[sha256sum] = "bad23ebcebf8e91cc727b229a3f87f95829edfd2a7653d47e97b154aac687c59" + diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index fef5ecdb0d..a727e8339e 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa" +SRCREV = "b719b93770393bbf20251e1dffc70498061e612c" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 5456dfb7ac..80c9309de4 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,12 +1,9 @@ require qt5-git.inc require ${PN}.inc -# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" - -# drop when bumping SRCREV -PR = "r1" +# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +# # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 QT_MODULE_BRANCH = "dev" -SRCREV = "701442ad6358b9f27978aafae82074124468f88c" +SRCREV = "d6104a92321c2e72b140156fddf0378c9795cdb4" diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch deleted file mode 100644 index b1145be14a..0000000000 --- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 3a1d11f3391d7745a01a68629d04f8b5b3c40ffb Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert - -This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native -is built without GUI support (no-png is set) and we still want to build -native lrelease + lupdate + lconvert tools. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - examples/examples.pro | 4 ++-- - src/designer/src/src.pro | 16 +++++++++------- - src/linguist/linguist.pro | 2 +- - src/src.pro | 10 ++++++---- - tests/auto/auto.pro | 22 ++++++++++++---------- - 5 files changed, 30 insertions(+), 24 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 4955969..8e86419 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -1,3 +1,3 @@ - TEMPLATE = subdirs --qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant -- -+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant -+qtHaveModule(widgets): SUBDIRS += linguist uitools -diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro -index e02ca8e..49527c5 100644 ---- a/src/designer/src/src.pro -+++ b/src/designer/src/src.pro -@@ -1,18 +1,20 @@ - TEMPLATE = subdirs - --SUBDIRS = \ -- uitools \ -- lib \ -- components \ -- designer -+!linguistonly { -+ SUBDIRS = \ -+ lib \ -+ components \ -+ designer -+} -+SUBDIRS += uitools - --contains(QT_CONFIG, shared): SUBDIRS += plugins -+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins - - components.depends = lib - designer.depends = components - plugins.depends = lib - --qtNomakeTools( \ -+!linguistonly:qtNomakeTools( \ - lib \ - components \ - designer \ -diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro -index df3c0c7..75bdf26 100644 ---- a/src/linguist/linguist.pro -+++ b/src/linguist/linguist.pro -@@ -3,7 +3,7 @@ SUBDIRS = \ - lrelease \ - lupdate \ - lconvert --!no-png:qtHaveModule(widgets): SUBDIRS += linguist -+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist - - qtNomakeTools( \ - linguist \ -diff --git a/src/src.pro b/src/src.pro -index c8756db..d71c4a0 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -4,10 +4,12 @@ qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { -- SUBDIRS = assistant \ -+ !linguistonly { -+ SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ -- designer -+ qtestlib -+ } -+ SUBDIRS += designer - # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer -@@ -20,7 +22,7 @@ mac { - SUBDIRS += macdeployqt - } - --qtHaveModule(dbus): SUBDIRS += qdbus -+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus - - qtNomakeTools( \ - pixeltool \ -diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index eaf440b..1778ad1 100644 ---- a/tests/auto/auto.pro -+++ b/tests/auto/auto.pro -@@ -1,14 +1,16 @@ - TEMPLATE=subdirs --SUBDIRS=\ -- linguist \ -- host.pro \ -- qhelpcontentmodel \ -- qhelpenginecore \ -- qhelpgenerator \ -- qhelpindexmodel \ -- qhelpprojectdata \ -- cmake \ -- installed_cmake -+!linguistonly { -+ SUBDIRS=\ -+ linguist \ -+ host.pro \ -+ qhelpcontentmodel \ -+ qhelpenginecore \ -+ qhelpgenerator \ -+ qhelpindexmodel \ -+ qhelpprojectdata \ -+ cmake \ -+ installed_cmake -+} - - installed_cmake.depends = cmake - --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qttools-native_5.1.1.bb b/recipes-qt/qt5/qttools-native_5.1.1.bb deleted file mode 100644 index e10484e33d..0000000000 --- a/recipes-qt/qt5/qttools-native_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781" -SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6" diff --git a/recipes-qt/qt5/qttools-native_5.2.0.bb b/recipes-qt/qt5/qttools-native_5.2.0.bb new file mode 100644 index 0000000000..0effa1bfa5 --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" +SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index bc1ec2a13d..72006ed868 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "441f3d964301942e417b238b6e71b2ad13b976f0" +SRCREV = "a60aa90f5ca00e32a1271a476f5da650dddebfda" diff --git a/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch similarity index 93% rename from recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch rename to recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index a5f26a3c72..ec82bb94fc 100644 --- a/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,4 +1,4 @@ -From 9337242944c936104db5eee64df804a27fb02bb8 Mon Sep 17 00:00:00 2001 +From a4af5dd2b0449df19271b22a62a03f70598106f0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert @@ -61,7 +61,7 @@ index e02ca8e..49527c5 100644 components \ designer \ diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro -index df3c0c7..75bdf26 100644 +index 2979a23..663bdd5 100644 --- a/src/linguist/linguist.pro +++ b/src/linguist/linguist.pro @@ -3,7 +3,7 @@ SUBDIRS = \ @@ -74,7 +74,7 @@ index df3c0c7..75bdf26 100644 qtNomakeTools( \ linguist \ diff --git a/src/src.pro b/src/src.pro -index c8756db..d71c4a0 100644 +index 866a199..ec08874 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,10 +4,12 @@ qtHaveModule(widgets) { @@ -93,15 +93,15 @@ index c8756db..d71c4a0 100644 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig linguist.depends = designer -@@ -20,7 +22,7 @@ mac { - SUBDIRS += macdeployqt +@@ -25,7 +27,7 @@ android { + SUBDIRS += androiddeployqt } -qtHaveModule(dbus): SUBDIRS += qdbus +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus - qtNomakeTools( \ - pixeltool \ + win32|winrt:SUBDIRS += windeployqt + diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index eaf440b..1778ad1 100644 --- a/tests/auto/auto.pro @@ -134,5 +134,5 @@ index eaf440b..1778ad1 100644 installed_cmake.depends = cmake -- -1.8.3.1 +1.8.4.3 diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch deleted file mode 100644 index 0571ea5e83..0000000000 --- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 19 Feb 2013 11:16:05 -0800 -Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency - -Not all platforms that use qtwayland depend on xcbcommon to be present -for them to be functional - -This change won't be needed when this commit from dev branch is merged -to stable: -commit 894adf8a447865119be7c6c4d01577d8032f4177 -Author: Oswald Buddenhagen -Date: Mon Apr 8 12:54:58 2013 +0200 - -make failure to configure wayland non-fatal for a top-level build of qt - -Signed-off-by: Martin Jansa ---- - qtwayland.pro | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtwayland.pro b/qtwayland.pro -index 24e104b..66dd38a 100644 ---- a/qtwayland.pro -+++ b/qtwayland.pro -@@ -11,7 +11,7 @@ qtCompileTest(xcomposite) - load(qt_parts) - - !config_wayland { -- error(QtWayland requires Wayland 1.0.3 or higher) -+ error("QtWayland requires Wayland 1.0.3 or higher") - } - - !config_xkbcommon { -@@ -19,7 +19,7 @@ load(qt_parts) - } - - !config_wayland_scanner { -- error(QtWayland requires wayland-scanner) -+ error("QtWayland requires wayland-scanner") - } - - !config_wayland_egl { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch deleted file mode 100644 index 771729086f..0000000000 --- a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Fri, 1 Mar 2013 13:00:53 -0800 -Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have - qtHaveModule - -Signed-off-by: Martin Jansa ---- - src/compositor/compositor_api/compositor_api.pri | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri -index f0bbe76..e7905e5 100644 ---- a/src/compositor/compositor_api/compositor_api.pri -+++ b/src/compositor/compositor_api/compositor_api.pri -@@ -12,7 +12,7 @@ SOURCES += \ - - QT += core-private - --qtHaveModule(quick) { -+#qtHaveModule(quick) { - SOURCES += \ - compositor_api/qwaylandsurfaceitem.cpp \ - compositor_api/qwaylandsurfacenode.cpp \ -@@ -27,4 +27,4 @@ qtHaveModule(quick) { - - QT += qml quick - QT += quick-private gui-private --} -+#} --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch deleted file mode 100644 index 58f82663f2..0000000000 --- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Wed, 6 Mar 2013 10:18:49 -0800 -Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL - -As per the EGL spec the context passed to that function should -be null. - -Signed-off-by: Martin Jansa ---- - .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- - 1 file changed, 2 insertions(+), 14 deletions(-) - -diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -index 73877c4..16e77fb 100644 ---- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -+++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp -@@ -101,7 +101,6 @@ public: - - PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; - -- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; - }; - - WaylandEglIntegration::WaylandEglIntegration() -@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); - if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) - { -- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); -- if (!d->get_egl_context) { -- qWarning("Failed to retrieve the get_egl_context function"); -- } - d->egl_bind_wayland_display = - reinterpret_cast(eglGetProcAddress("eglBindWaylandDisplayWL")); - d->egl_unbind_wayland_display = -@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla - reinterpret_cast(eglGetProcAddress("glEGLImageTargetTexture2DOES")); - - if (d->egl_bind_wayland_display -- && d->get_egl_context - && d->egl_unbind_wayland_display - && d->egl_create_image - && d->egl_destroy_image -@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL - return 0; - } - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - -@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC - { - Q_D(const WaylandEglIntegration); - -- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); -- EGLContext egl_context = d->get_egl_context(context); -- -- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, -+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, - EGL_WAYLAND_BUFFER_WL, - buffer, NULL); - return image; --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 20cd2519c2..2ffaff6144 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -2,8 +2,7 @@ require qt5-git.inc require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 -# while qtwayland_git stays compatible with 5.0.2 -PV = "5.1.0+git${SRCPV}" +# this PV is only to indicate that this recipe is compatible with qt5 5.2.0 +PV = "5.2.0+git${SRCPV}" -SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" +SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 158022357b..eec26b673a 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -7,18 +7,11 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod # wayland-native is already in wayland DEPENDS, but add it here # explicitly, because it's native wayland-scanner we're looking for -# libxkbcommon isn't mandatory with 0001-xcbcommon-should-not-be-a-mandatory-dependency.patch -# make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't -# have libxkbcommon in oe-core). +# libxkbcommon isn't mandatory make it easier to remove by .bbappend +# (e.g. for building qtwayland with danny which doesn't have libxkbcommon in oe-core). XKB_DEPENDS = "libxkbcommon xproto" DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}" -SRC_URI += " \ - file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ - file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ - file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ -" - QT_WAYLAND_CONFIG ?= "wayland-compositor" QT_WAYLAND_DEFINES ?= "" QT_WAYLAND_BUILD_PARTS ?= "examples" diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch similarity index 100% rename from recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch rename to recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch diff --git a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch deleted file mode 100644 index 6bbbaa1ebc..0000000000 --- a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 -From: Carsten Munk -Date: Wed, 17 Jul 2013 07:28:04 +0000 -Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: *** - [sub-qml-compositor-make_first] Error 3 - -Cherry-picked from: -https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 - -Signed-off-by: Carsten Munk ---- - qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro -index 0bc0b02..e397002 100644 ---- a/examples/qml-compositor/qml-compositor.pro -+++ b/examples/qml-compositor/qml-compositor.pro -@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK - - LIBS += -L ../../lib - --QT += quick qml v8 -+QT += quick qml - QT += quick-private - - QT += compositor --- -1.8.4 - diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 02971d66af..640373e031 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -2,11 +2,6 @@ require qt5-git.inc require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 -PV = "5.1.0+git${SRCPV}" +# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 -SRC_URI += "file://fix.missing.v8.public.api.patch" - -# newer revisions depend on newer wayland-1.1 APIs -SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3" -# SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" +SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb deleted file mode 100644 index d0f61de494..0000000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "660b4e169a13074d2edcc3110a7b5ba8" -SRC_URI[sha256sum] = "1297212198790f186cb647dcfa929fd2de0824bd04578cf041355e4eabb33ff2" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb new file mode 100644 index 0000000000..934873634e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "8431a8476213b3a3587e04b023a2435f" +SRC_URI[sha256sum] = "80e7eb55ea6c4a4e92f44eb1d3cd7c9ecd85f9d5e48e682a31473633fa46a64e" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 67c2091d89..582833e1ac 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "08118e862731b5ce91368d326a04b4a565e7f483" +SRCREV = "634cddbfef6a40b991bcdf8e68e5329747f43c57" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 2d211c7b16..8f475d7d6c 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -3,7 +3,7 @@ require qt5.inc LICENSE = "BSD & LGPLv2+" LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ - file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" + file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee" DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" @@ -15,6 +15,7 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " SRC_URI += "file://fix-rpath.patch" +SRC_URI += "file://0001-jsc-Add-licuuc-licui18n-LIBS.patch" # make sure rb files are used from sysroot, not from host # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` diff --git a/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch b/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch new file mode 100644 index 0000000000..f9e97cb97d --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch @@ -0,0 +1,443 @@ +From 19da0b2f95c4c4ad3cc35ea3c6bb34adf4886a32 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 15:47:13 +0100 +Subject: [PATCH] jsc: Add -licuuc -licui18n LIBS + +* fails to link without them: +OE @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore $ x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-O1 -o ../../bin/jsc .obj/release-shared/jsc.o -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lQt5Core -lpthread -lpthread /OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)': +Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)': +Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::nextTokenIsColon()': +Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)': +Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(YarrInterpreter.o): In function `JSC::Yarr::ByteCompiler::emitDisjunction(JSC::Yarr::PatternDisjunction*, unsigned int, unsigned int)': +YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1117): undefined reference to `u_tolower_51' +YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1126): undefined reference to `u_toupper_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(DatePrototype.o): In function `JSC::formatLocaleDate(JSC::ExecState*, JSC::DateInstance*, double, JSC::LocaleDateTimeFormat) [clone .isra.61]': +DatePrototype.cpp:(.text+0x57cc): undefined reference to `udat_open_51' +DatePrototype.cpp:(.text+0x57f8): undefined reference to `udat_format_51' +DatePrototype.cpp:(.text+0x5802): undefined reference to `udat_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(FunctionPrototype.o): In function `JSC::functionProtoFuncToString(JSC::ExecState*)': +FunctionPrototype.cpp:(.text+0x2666): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::isStrWhiteSpace(unsigned short)': +JSGlobalObjectFunctions.cpp:(.text+0x458): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::jsToNumber(WTF::String const&)': +JSGlobalObjectFunctions.cpp:(.text+0x789): undefined reference to `u_charType_51' +JSGlobalObjectFunctions.cpp:(.text+0x7bf): undefined reference to `u_charType_51' +JSGlobalObjectFunctions.cpp:(.text+0xc75): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o):JSGlobalObjectFunctions.cpp:(.text+0x1cd1): more undefined references to `u_charType_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(WTF::String const&, WTF::Vector&, WTF::Base64DecodePolicy)': +Base64.cpp:(.text+0x5c8): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(char const*, unsigned int, WTF::Vector&, WTF::Base64DecodePolicy)': +Base64.cpp:(.text+0x1441): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned char const*, unsigned char const*, unsigned int)': +StringImpl.cpp:(.text+0x6e4): undefined reference to `u_foldCase_51' +StringImpl.cpp:(.text+0x6f1): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned short const*, unsigned char const*, unsigned int)': +StringImpl.cpp:(.text+0x754): undefined reference to `u_foldCase_51' +StringImpl.cpp:(.text+0x761): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::findIgnoringCase(WTF::StringImpl*, unsigned int)': +StringImpl.cpp:(.text+0x2eb4): undefined reference to `u_memcasecmp_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::reverseFindIgnoringCase(WTF::StringImpl*, unsigned int)': +StringImpl.cpp:(.text+0x35f3): undefined reference to `u_memcasecmp_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(WTF::StringImpl const*, unsigned char const*)': +StringImpl.cpp:(.text+0x4139): undefined reference to `u_foldCase_51' +StringImpl.cpp:(.text+0x4149): undefined reference to `u_foldCase_51' +StringImpl.cpp:(.text+0x421d): undefined reference to `u_foldCase_51' +StringImpl.cpp:(.text+0x422d): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCaseNonNull(WTF::StringImpl const*, WTF::StringImpl const*)': +StringImpl.cpp:(.text+0x42a5): undefined reference to `u_memcasecmp_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::defaultWritingDirection(bool*)': +StringImpl.cpp:(.text+0x438b): undefined reference to `u_charDirection_51' +StringImpl.cpp:(.text+0x43b6): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::simplifyWhiteSpace()': +StringImpl.cpp:(.text+0x48b1): undefined reference to `u_charDirection_51' +StringImpl.cpp:(.text+0x48e1): undefined reference to `u_charDirection_51' +StringImpl.cpp:(.text+0x49f1): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o):StringImpl.cpp:(.text+0x4a19): more undefined references to `u_charDirection_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::lower()': +StringImpl.cpp:(.text+0x69bd): undefined reference to `u_strToLower_51' +StringImpl.cpp:(.text+0x6b51): undefined reference to `u_strToLower_51' +StringImpl.cpp:(.text+0x6c31): undefined reference to `u_tolower_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::foldCase()': +StringImpl.cpp:(.text+0x6cde): undefined reference to `u_tolower_51' +StringImpl.cpp:(.text+0x6d9e): undefined reference to `u_strFoldCase_51' +StringImpl.cpp:(.text+0x6e12): undefined reference to `u_strFoldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::upper()': +StringImpl.cpp:(.text+0x6f9f): undefined reference to `u_strToUpper_51' +StringImpl.cpp:(.text+0x7031): undefined reference to `u_strToUpper_51' +StringImpl.cpp:(.text+0x70ec): undefined reference to `u_toupper_51' +StringImpl.cpp:(.text+0x71ea): undefined reference to `u_toupper_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned char const*, unsigned long, bool*, int)': +WTFString.cpp:(.text+0x2d81): undefined reference to `u_charDirection_51' +WTFString.cpp:(.text+0x3031): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned short const*, unsigned long, bool*, int)': +WTFString.cpp:(.text+0x30c1): undefined reference to `u_charDirection_51' +WTFString.cpp:(.text+0x3331): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToUIntStrict(unsigned char const*, unsigned long, bool*, int)': +WTFString.cpp:(.text+0x3451): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o):WTFString.cpp:(.text+0x36b9): more undefined references to `u_charDirection_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::~Collator()': +CollatorICU.cpp:(.text+0x98): undefined reference to `ucol_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::createCollator() const': +CollatorICU.cpp:(.text+0x174): undefined reference to `ucol_getLocaleByType_51' +CollatorICU.cpp:(.text+0x18b): undefined reference to `ucol_getAttribute_51' +CollatorICU.cpp:(.text+0x1d0): undefined reference to `ucol_open_51' +CollatorICU.cpp:(.text+0x1f3): undefined reference to `ucol_open_51' +CollatorICU.cpp:(.text+0x211): undefined reference to `ucol_setAttribute_51' +CollatorICU.cpp:(.text+0x226): undefined reference to `ucol_setAttribute_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::releaseCollator()': +CollatorICU.cpp:(.text+0x368): undefined reference to `ucol_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::collate(unsigned short const*, unsigned long, unsigned short const*, unsigned long) const': +CollatorICU.cpp:(.text+0x2e6): undefined reference to `ucol_strcoll_51' +CollatorICU.cpp:(.text+0x327): undefined reference to `ucol_strcoll_51' +collect2: error: ld returned 1 exit status + +* and later when linking main library: +E @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source $ make -j 9 MAKEFLAGS='-j 9' OE_QMAKE_COMPILER='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CC='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CXX='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types' OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden' OE_QMAKE_LINK='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' OE_QMAKE_AR='x86_64-oe-linux-ar' OE_QMAKE_STRIP='echo' OE_QMAKE_WAYLAND_SCANNER='/OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/wayland-scanner' -f Makefile.api +rm -f libQt5WebKit.so.5.2.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.2 +x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--no-undefined -Wl,-O1 -shared -Wl,-Bsymbolic-functions -Wl,-soname,libQt5WebKit.so.5 -o libQt5WebKit.so.5.2.0 -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release -Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit2/release -lrt -Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release -lz -lXrender -ludev -lXcomposite -lXrender -ljpeg -lpng -Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/ThirdParty/ANGLE/release -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lXext -lX11 -lm -lX11 -lxslt -lxml2 -lz -lm -ldl -lm -lxml2 -lxml2 -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstapp-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstinterfaces-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstpbutils-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstvideo-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lsqlite3 -lQt5Quick -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Positioning -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sql -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sensors -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lGL +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)': +Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)': +Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::nextTokenIsColon()': +Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)': +Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': +FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xdc): undefined reference to `u_foldCase_51' +FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xf3): undefined reference to `u_foldCase_51' +FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51' +FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x313): undefined reference to `u_foldCase_51' +FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x357): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o):FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TypeAhead.o): In function `WebCore::TypeAhead::handleEvent(WebCore::KeyboardEvent*, unsigned int)': +TypeAhead.cpp:(.text._ZN7WebCore9TypeAhead11handleEventEPNS_13KeyboardEventEj+0x511): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CanvasRenderingContext2D.o): In function `WTF::isSpaceOrNewline(unsigned short)': +CanvasRenderingContext2D.cpp:(.text._ZN3WTFL16isSpaceOrNewlineEt+0x30): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginAccessControl.o): In function `WebCore::isOnAccessControlResponseHeaderWhitelist(WTF::String const&)': +CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x8c): undefined reference to `u_foldCase_51' +CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0xa3): undefined reference to `u_foldCase_51' +CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1dc): undefined reference to `u_foldCase_51' +CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1f3): undefined reference to `u_foldCase_51' +CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x226): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZNK7WebCore35CrossOriginPreflightResultCacheItem24allowsCrossOriginHeadersERKNS_13HTTPHeaderMapERN3WTF6StringE+0xac): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList(WTF::String const&, unsigned int, unsigned int, WTF::HashSet >&)': +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x19c): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList(WTF::String const&, unsigned int, unsigned int, WTF::HashSet >&)': +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x13c): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x153): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x254): undefined reference to `u_charDirection_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2d4): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2eb): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x327): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x45c): undefined reference to `u_foldCase_51' +CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x473): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x5cc): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ContextMenuController.o): In function `WebCore::selectionContainsPossibleWord(WebCore::Frame*)': +ContextMenuController.cpp:(.text._ZN7WebCoreL29selectionContainsPossibleWordEPNS_5FrameE+0x96): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontGlyphs.o): In function `WebCore::FontGlyphs::glyphDataAndPageForCharacter(WebCore::FontDescription const&, int, bool, WebCore::FontDataVariant) const': +FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x49d): undefined reference to `u_charMirror_51' +FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x5b6): undefined reference to `u_toupper_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Font.o): In function `WebCore::Font::canReceiveTextEmphasis(int)': +Font.cpp:(.text._ZN7WebCore4Font22canReceiveTextEmphasisEi+0x4): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o): In function `WTF::HashTableIterator >, WTF::KeyValuePairKeyExtractor > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits > >, WebCore::FontPlatformDataCacheKeyTraits> WTF::HashTable >, WTF::KeyValuePairKeyExtractor > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits > >, WebCore::FontPlatformDataCacheKeyTraits>::find, WebCore::FontPlatformDataCacheKey>(WebCore::FontPlatformDataCacheKey const&)': +FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0xec): undefined reference to `u_foldCase_51' +FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x100): undefined reference to `u_foldCase_51' +FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x23c): undefined reference to `u_foldCase_51' +FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x250): undefined reference to `u_foldCase_51' +FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x27f): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o):FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi]+0x17d): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(GraphicsContext.o): In function `WebCore::GraphicsContext::drawBidiText(WebCore::Font const&, WebCore::TextRun const&, WebCore::FloatPoint const&, WebCore::Font::CustomFontNotReadyAction)': +GraphicsContext.cpp:(.text._ZN7WebCore15GraphicsContext12drawBidiTextERKNS_4FontERKNS_7TextRunERKNS_10FloatPointENS1_24CustomFontNotReadyActionE+0x4de): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGGlyph.o): In function `WebCore::charactersWithArabicForm(WTF::String const&, bool)': +SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x59): undefined reference to `ublock_getCode_51' +SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x8e): undefined reference to `ublock_getCode_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SurrogatePairAwareTextIterator.o): In function `WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks()': +SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x28): undefined reference to `u_getCombiningClass_51' +SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x6d): undefined reference to `unorm_normalize_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal(WebCore::SurrogatePairAwareTextIterator&, WebCore::GlyphBuffer*)': +WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x109e): undefined reference to `u_toupper_51' +WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x10be): undefined reference to `u_toupper_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal(WebCore::Latin1TextIterator&, WebCore::GlyphBuffer*)': +WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x106f): undefined reference to `u_toupper_51' +WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x108d): undefined reference to `u_toupper_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WebCore::appendEncodedHostname(WTF::Vector&, unsigned short const*, unsigned int) [clone .part.54]': +KURL.cpp:(.text._ZN7WebCoreL21appendEncodedHostnameERN3WTF6VectorItLm512ENS0_15CrashOnOverflowEEEPKtj.part.54+0x39): undefined reference to `uidna_IDNToASCII_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': +KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' +KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' +KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' +KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' +KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o):KURL.cpp:(.text._ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj[_ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj]+0x7c): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Length.o): In function `WebCore::parseLength(unsigned short const*, unsigned int)': +Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x176): undefined reference to `u_charDirection_51' +Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x230): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o): In function `WTF::HashTable*>, WTF::KeyValuePairKeyExtractor*> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits*> >, WTF::HashTraits >::rehash(int)': +MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' +MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' +MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51' +MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x313): undefined reference to `u_foldCase_51' +MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x358): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o):MIMETypeRegistry.cpp:(.text._ZN7WebCoreL16mediaMIMETypeMapEv+0xcc): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTTPParsers.o): In function `WebCore::extractMIMETypeFromMediaType(WTF::String const&)': +HTTPParsers.cpp:(.text._ZN7WebCore28extractMIMETypeFromMediaTypeERKN3WTF6StringE+0x1a4): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceRequestBase.o): In function `WebCore::ResourceRequestBase::setHTTPHeaderField(WTF::AtomicString const&, WTF::String const&)': +ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x9d): undefined reference to `u_foldCase_51' +ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0xb5): undefined reference to `u_foldCase_51' +ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x31f): undefined reference to `u_foldCase_51' +ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x36d): undefined reference to `u_foldCase_51' +ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x385): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceResponseBase.o):ResourceResponseBase.cpp:(.text._ZN7WebCore20ResourceResponseBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x8c): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `charCat(unsigned short) [clone .part.4]': +XPathParser.cpp:(.text._ZL7charCatt.part.4+0x8): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `WebCore::XPath::Parser::skipWS()': +XPathParser.cpp:(.text._ZN7WebCore5XPath6Parser6skipWSEv+0x3d): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::addAllCodePoints(USet*, WTF::String const&)': +SmartReplaceICU.cpp:(.text._ZN7WebCoreL16addAllCodePointsEP4USetRKN3WTF6StringE+0x46): undefined reference to `uset_add_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)': +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x2b): undefined reference to `uset_contains_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x7e): undefined reference to `uset_openPattern_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x93): undefined reference to `uset_addRange_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xa5): undefined reference to `uset_addRange_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xb7): undefined reference to `uset_addRange_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xc9): undefined reference to `uset_addRange_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xdb): undefined reference to `uset_addRange_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o):SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xed): more undefined references to `uset_addRange_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)': +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x209): undefined reference to `uset_openPattern_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x217): undefined reference to `uset_addAll_51' +SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x21f): undefined reference to `uset_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o): In function `WTF::HashTable (*)(WebCore::KURL const&, WebCore::SharedBuffer*)>, WTF::KeyValuePairKeyExtractor (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::HashTraits >::rehash(int)': +ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' +ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' +ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' +ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' +ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o):ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGAllInOne.o): In function `WebCore::SVGFontData::createStringWithMirroredCharacters(unsigned short const*, unsigned int) const': +SVGAllInOne.cpp:(.text._ZNK7WebCore11SVGFontData34createStringWithMirroredCharactersEPKtj+0x129): undefined reference to `u_charMirror_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::(anonymous namespace)::parseToken(unsigned short const*, unsigned short const*, unsigned short const**, unsigned short const**)': +InspectorAllInOne.cpp:(.text._ZN7WebCore12_GLOBAL__N_110parseTokenEPKtS2_PS2_S3_+0x49): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorStyleTextEditor::internalReplaceProperty(WebCore::InspectorStyleProperty const&, WTF::String const&, WebCore::SourceRange*, unsigned int*)': +InspectorAllInOne.cpp:(.text._ZN7WebCore24InspectorStyleTextEditor23internalReplacePropertyERKNS_22InspectorStylePropertyERKN3WTF6StringEPNS_11SourceRangeEPj+0x43a): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorResourceAgent::willLoadXHR(WebCore::ThreadableLoaderClient*, WTF::String const&, WebCore::KURL const&, bool, WTF::PassRefPtr, WebCore::HTTPHeaderMap const&, bool)': +InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x12c): undefined reference to `u_foldCase_51' +InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x13b): undefined reference to `u_foldCase_51' +InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3cc): undefined reference to `u_foldCase_51' +InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3db): undefined reference to `u_foldCase_51' +InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x411): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::setUpIterator(bool&, WebCore::TextBreakIterator*&, UBreakIteratorType, unsigned short const*, int)': +TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x3e): undefined reference to `ubrk_setText_51' +TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x80): undefined reference to `ubrk_open_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackEscape(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': +TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51' +TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x90): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackSubstitute(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': +TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51' +TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x98): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textClone(UText*, UText const*, signed char, UErrorCode*)': +TextAllInOne.cpp:(.text._ZN7WebCoreL9textCloneEP5UTextPKS0_aP10UErrorCode+0x27): undefined reference to `utext_setup_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::endOfFirstWordBoundaryContext(unsigned short const*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x26): undefined reference to `u_getIntPropertyValue_51' +TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x84): undefined reference to `u_getIntPropertyValue_51' +TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0xa6): undefined reference to `u_getIntPropertyValue_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::startOfLastWordBoundaryContext(unsigned short const*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x1e): undefined reference to `u_getIntPropertyValue_51' +TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x77): undefined reference to `u_getIntPropertyValue_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o):TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x96): more undefined references to `u_getIntPropertyValue_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::NonSharedCharacterBreakIterator::~NonSharedCharacterBreakIterator()': +TextAllInOne.cpp:(.text._ZN7WebCore31NonSharedCharacterBreakIteratorD2Ev+0x24): undefined reference to `ubrk_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numGraphemeClusters(WTF::String const&)': +TextAllInOne.cpp:(.text._ZN7WebCore19numGraphemeClustersERKN3WTF6StringE+0x48): undefined reference to `ubrk_next_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numCharactersInGraphemeClusters(WTF::String const&, unsigned int)': +TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0x9d): undefined reference to `ubrk_next_51' +TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0xe9): undefined reference to `ubrk_current_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFirst(WebCore::TextBreakIterator*)': +TextAllInOne.cpp:(.text._ZN7WebCore14textBreakFirstEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_first_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakNext(WebCore::TextBreakIterator*)': +TextAllInOne.cpp:(.text._ZN7WebCore13textBreakNextEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_next_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakPreceding(WebCore::TextBreakIterator*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore18textBreakPrecedingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_preceding_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFollowing(WebCore::TextBreakIterator*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore18textBreakFollowingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_following_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakCurrent(WebCore::TextBreakIterator*)': +TextAllInOne.cpp:(.text._ZN7WebCore16textBreakCurrentEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_current_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isTextBreak(WebCore::TextBreakIterator*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore11isTextBreakEPNS_17TextBreakIteratorEi+0x5): undefined reference to `ubrk_isBoundary_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isWordTextBreak(WebCore::TextBreakIterator*)': +TextAllInOne.cpp:(.text._ZN7WebCore15isWordTextBreakEPNS_17TextBreakIteratorE+0x5): undefined reference to `ubrk_getRuleStatus_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::cursorMovementIterator(unsigned short const*, int)': +TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0x43): undefined reference to `ubrk_setText_51' +TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0xb3): undefined reference to `ubrk_openRules_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::urlEscapedEntityCallback(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': +TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x1a): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' +TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x59): undefined reference to `ucnv_cbFromUWriteBytes_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkUrlEscapedEntityCallack(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': +TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x65): undefined reference to `ucnv_cbFromUWriteUChars_51' +TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x9d): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::ICUConverterWrapper::~ICUConverterWrapper()': +TextAllInOne.cpp:(.text._ZN7WebCore19ICUConverterWrapperD2Ev+0x9): undefined reference to `ucnv_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerEncodingNames(void (*)(char const*, char const*))': +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x21): undefined reference to `ucnv_countAvailable_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x56): undefined reference to `ucnv_getStandardName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x7e): undefined reference to `ucnv_getAvailableName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x9b): undefined reference to `ucnv_getStandardName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x136): undefined reference to `ucnv_countAliases_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x182): undefined reference to `ucnv_getAlias_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerCodecs(void (*)(char const*, WTF::PassOwnPtr (*)(WebCore::TextEncoding const&, void const*), void const*))': +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x38): undefined reference to `ucnv_getCanonicalName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x51): undefined reference to `ucnv_countAvailable_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x7e): undefined reference to `ucnv_getStandardName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xa0): undefined reference to `ucnv_getAvailableName_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xbd): undefined reference to `ucnv_getStandardName_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::releaseICUConverter() const': +TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x42): undefined reference to `ucnv_close_51' +TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x4b): undefined reference to `ucnv_reset_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::createICUConverter() const': +TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x79): undefined reference to `ucnv_getName_51' +TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x95): undefined reference to `ucnv_open_51' +TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0xab): undefined reference to `ucnv_setFallback_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::decode(char const*, unsigned long, bool, bool, bool&)': +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x49): undefined reference to `UCNV_TO_U_CALLBACK_SUBSTITUTE_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x73): undefined reference to `ucnv_setToUCallBack_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x122): undefined reference to `ucnv_toUnicode_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x183): undefined reference to `ucnv_toUnicode_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x25d): undefined reference to `ucnv_setToUCallBack_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextEncoding::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling) const': +TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x68): undefined reference to `unorm_quickCheck_51' +TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x9d): undefined reference to `unorm_normalize_51' +TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x1bf): undefined reference to `unorm_normalize_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling)': +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x13f): undefined reference to `ucnv_fromUnicode_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x198): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x1b5): undefined reference to `ucnv_setFromUCallBack_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x31c): undefined reference to `ucnv_setSubstChars_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x330): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51' +TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x343): undefined reference to `ucnv_setFromUCallBack_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned char const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)': +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x174): undefined reference to `utext_setup_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1c9): undefined reference to `ubrk_setUText_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1dd): undefined reference to `utext_close_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x2ac): undefined reference to `ubrk_open_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x356): undefined reference to `ubrk_open_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned short const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)': +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x168): undefined reference to `utext_setup_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1bd): undefined reference to `ubrk_setUText_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1d1): undefined reference to `utext_close_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x29c): undefined reference to `ubrk_open_51' +TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x346): undefined reference to `ubrk_open_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::releaseLineBreakIterator(WebCore::TextBreakIterator*)': +TextAllInOne.cpp:(.text._ZN7WebCore24releaseLineBreakIteratorEPNS_17TextBreakIteratorE+0x190): undefined reference to `ubrk_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::detectTextEncoding(char const*, unsigned long, char const*, WebCore::TextEncoding*)': +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x40): undefined reference to `ucsdet_open_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x6c): undefined reference to `ucsdet_enableInputFilter_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x7d): undefined reference to `ucsdet_setText_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x95): undefined reference to `ucsdet_detectAll_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x100): undefined reference to `ucsdet_getConfidence_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x118): undefined reference to `ucsdet_getName_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x14d): undefined reference to `ucsdet_close_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x16c): undefined reference to `ucsdet_getName_51' +TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x197): undefined reference to `ucsdet_close_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::StringImpl** WTF::HashTable, WTF::HashTraits >::lookup, WTF::StringImpl*>(WTF::StringImpl* const&)': +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x64): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x7b): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x197): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x1fc): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x20b): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x286): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WebCore::HTMLSelectElement::defaultEventHandler(WebCore::Event*)': +HTMLElementsAllInOne.cpp:(.text._ZN7WebCore17HTMLSelectElement19defaultEventHandlerEPNS_5EventE+0xbe): undefined reference to `u_isprint_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::HashTable, WTF::HashTraits >::rehash(int)': +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x11e): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2ac): undefined reference to `u_foldCase_51' +HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2c3): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x337): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::searcher()': +EditingAllInOne.cpp:(.text._ZN7WebCoreL8searcherEv+0xba): undefined reference to `usearch_open_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::normalizeCharacters(unsigned short const*, unsigned int, WTF::Vector&)': +EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0x4c): undefined reference to `unorm_normalize_51' +EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0xa3): undefined reference to `unorm_normalize_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::SearchBuffer::search(unsigned long&)': +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x55): undefined reference to `usearch_setText_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x63): undefined reference to `usearch_setOffset_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x6e): undefined reference to `usearch_next_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xb7): undefined reference to `usearch_getMatchedLength_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x1d7): undefined reference to `usearch_next_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x7b4): undefined reference to `u_charType_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x8f2): undefined reference to `u_charType_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x9c4): undefined reference to `u_charType_51' +EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xad8): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': +EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' +EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' +EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' +EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' +EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o):EditingAllInOne.cpp:(.text._ZN7WebCoreL15internalCommandERKN3WTF6StringE+0x8c): more undefined references to `u_foldCase_51' follow +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::findPlainText(WebCore::Range const*, WTF::String const&, unsigned int)': +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x539): undefined reference to `usearch_getCollator_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x555): undefined reference to `ucol_getStrength_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x565): undefined reference to `ucol_setStrength_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x56d): undefined reference to `usearch_reset_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x5a1): undefined reference to `usearch_setPattern_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x75f): undefined reference to `usearch_setPattern_51' +EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0xf29): undefined reference to `u_charType_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::VisibleSelection::appendTrailingWhitespace()': +EditingAllInOne.cpp:(.text._ZN7WebCore16VisibleSelection24appendTrailingWhitespaceEv+0x305): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::WordAwareIterator::advance()': +EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x341): undefined reference to `u_charDirection_51' +EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x3a9): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::previousBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))': +EditingAllInOne.cpp:(.text._ZN7WebCoreL16previousBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0x1a0): undefined reference to `u_getIntPropertyValue_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::nextBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))': +EditingAllInOne.cpp:(.text._ZN7WebCoreL12nextBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0xe1): undefined reference to `u_getIntPropertyValue_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::Editor::insertTextWithoutSendingTextEvent(WTF::String const&, bool, WebCore::TextEvent*)': +EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3cb): undefined reference to `u_ispunct_51' +EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3d8): undefined reference to `u_charDirection_51' +/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWe +... + +Signed-off-by: Martin Jansa +--- + Source/JavaScriptCore/jsc.pro | 2 ++ + Source/api.pri | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro +index dfd73e8..ef6e55d 100644 +--- a/Source/JavaScriptCore/jsc.pro ++++ b/Source/JavaScriptCore/jsc.pro +@@ -27,6 +27,8 @@ wince* { + LIBS += mmtimer.lib + } + ++LIBS += "-licuuc -licui18n" ++ + # Prevent warnings about difference in visibility on Mac OS X + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +diff --git a/Source/api.pri b/Source/api.pri +index ccd206c..39c56dd 100644 +--- a/Source/api.pri ++++ b/Source/api.pri +@@ -29,6 +29,8 @@ use?(3D_GRAPHICS): WEBKIT += angle + MODULE = webkit + CONFIG += creating_module + ++LIBS += "-licuuc -licui18n" ++ + # This is the canonical list of dependencies for the public API of + # the QtWebKit library, and will end up in the library's prl file. + QT_API_DEPENDS = core gui network +-- +1.8.4.3 + diff --git a/recipes-qt/qt5/qtwebkit_5.1.1.bb b/recipes-qt/qt5/qtwebkit_5.1.1.bb deleted file mode 100644 index afb2dc2e19..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "70e956dafcee1969de53d4de7b4691ad" -SRC_URI[sha256sum] = "d6ee1e9111b0996277a512ae71736a05faa7c0de6d69ac2978adce79c3116a24" diff --git a/recipes-qt/qt5/qtwebkit_5.2.0.bb b/recipes-qt/qt5/qtwebkit_5.2.0.bb new file mode 100644 index 0000000000..1e16a89ab7 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "1378e18aecd8cc223deb729c8f0a735d" +SRC_URI[sha256sum] = "390e16e719e41bcc94fd79866a0909b70235513778063c5e47227b8b9876e0cf" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index ebfc56c788..af8598a672 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c31ff44d3a17fab37754acb2a0a29cd6eba10699" +SRCREV = "4c86230bfe563ef1e3ef493b870203761bc9f32d" diff --git a/recipes-qt/qt5/qtx11extras_5.1.1.bb b/recipes-qt/qt5/qtx11extras_5.1.1.bb deleted file mode 100644 index 3d4d03086b..0000000000 --- a/recipes-qt/qt5/qtx11extras_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "b5910f7f503baf56082f89bce917651b" -SRC_URI[sha256sum] = "a37f9e9436497ef96bd644b264752a415ffef57d5f5886010f079e332620c02a" diff --git a/recipes-qt/qt5/qtx11extras_5.2.0.bb b/recipes-qt/qt5/qtx11extras_5.2.0.bb new file mode 100644 index 0000000000..75ba58cdf1 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "1a11c4bb67503e2a5ef10b96bbe11b61" +SRC_URI[sha256sum] = "98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 1d4a7253e8..ec4054ebb6 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" +SRCREV = "120c2267e1960c03a22531c2d5bfe1d87d401ad9" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb deleted file mode 100644 index 646e32a871..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0db5f74de2a2e93bc2747a609ff81d5f" -SRC_URI[sha256sum] = "bc7b48347ce3ab5d6a22223c001659f3d898cbd3ef9e35688d7ad1bf8e7510b5" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb new file mode 100644 index 0000000000..dede57b7f9 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "7c3e94cd04603c3f81e50d47daf5bbc7" +SRC_URI[sha256sum] = "a8192ee70d8d3e9944a8d8f03521e3abf6beb7f6de1bf2d80871dfc4d9bd2a2a" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index e824b8e7c4..8d3574607b 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "808c59c00f23109d1887022c2d9a6f4e5ecc72a4" +SRCREV = "97f266a006d82cc8554915cba6bf767b93d71a06" From 0b4bdeb6c195b3e1abf32e96354e4401d596ec0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 17 Dec 2013 11:44:22 +0100 Subject: [PATCH 286/347] qtbase: remove gstreamer packageconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nothing in qtbase uses gstreamer so the configure option was removed on the way to 5.2 [1]. Fixes: | -no-gstreamer: invalid command-line switch [1] https://qt.gitorious.org/qt/qtbase/commit/e25a4faf4a33a758a51c1b96dfdead2f1675ccd7 Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtbase.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index cd3a939cd0..83ce25b556 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -102,7 +102,6 @@ PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" # depends on glib -PACKAGECONFIG[gstreamer] = "-gstreamer,-no-gstreamer,gstreamer" PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" From b8a236df79c25802c1f2eb2525e8a534e73e608e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 12 Jan 2014 14:55:37 +0100 Subject: [PATCH 287/347] qt5: Fix cmake config files * without syncqt cmake config files have empty PRIVATE_INCLUDE_DIRS remove pregenerated header files and create .git dir to let qmake call syncqt and generate headers like when building from git recipes Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 7 +++++++ recipes-qt/qt5/qt5.inc | 8 ++++++++ recipes-qt/qt5/qtbase-native_git.bb | 21 --------------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 76816027fe..853502889f 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -10,3 +10,10 @@ 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}" + +# Regenerate header files when they are included in source tarball +# Otherwise cmake files don't set PRIVATE_HEADERS correctly +do_configure_prepend() { + rm -rf ${S}/include + mkdir -p ${S}/.git || true +} diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 57ffe098ed..7e739c5495 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -32,6 +32,14 @@ python __anonymous() { d.setVar("PACKAGE_ARCH", tarch) } + +# Regenerate header files when they are included in source tarball +# Otherwise cmake files don't set PRIVATE_HEADERS correctly +do_configure_prepend() { + rm -rf ${S}/include + mkdir -p ${S}/.git || true +} + PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " # extra -dbg packages diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ce823d26e0..471d95b3b9 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,27 +1,6 @@ require qt5-git.inc require ${PN}.inc -# common with target version -SRC_URI = "\ - git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ - 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_functions-temporary-remove-isEmpty-check.patch \ - file://0005-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0006-qt_module-Fix-pkgconfig-replacement.patch \ - file://0007-qt_module-Fix-paths-in-.prl-files.patch \ - file://0008-wayland-scanner-disable-silent-rules.patch \ - file://0009-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0010-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ - file://0011-configure-make-pulseaudio-a-configurable-option.patch \ - file://0012-configure-make-alsa-a-configurable-option.patch \ - file://0013-configure-make-freetype-a-configurable-option.patch \ - file://0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ -" - -SRC_URI += "file://0015-Always-build-uic.patch" - do_install_append() { # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) # e.g. qt3d, qtwayland From fc289452b6465009a4c7ae6aa70060e55779a81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jan 2014 15:59:18 +0100 Subject: [PATCH 288/347] qttools: add target build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this does not build much yet but I was looking for qdbus Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools.inc | 9 ++++++ ...p-fix-linking-of-dependent-libraries.patch | 32 +++++++++++++++++++ recipes-qt/qt5/qttools_5.2.0.bb | 5 +++ 3 files changed, 46 insertions(+) create mode 100644 recipes-qt/qt5/qttools.inc create mode 100644 recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch create mode 100644 recipes-qt/qt5/qttools_5.2.0.bb diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc new file mode 100644 index 0000000000..8412db499b --- /dev/null +++ b/recipes-qt/qt5/qttools.inc @@ -0,0 +1,9 @@ +require qt5.inc + +DEPENDS += "qtbase" + +SRC_URI += " \ + file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ +" + +FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch new file mode 100644 index 0000000000..0f9533389f --- /dev/null +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch @@ -0,0 +1,32 @@ +From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 17 Jan 2014 14:33:19 +0100 +Subject: [PATCH] assistant/help: fix linking of dependent libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get: +| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link) +| ...undefined reference to `QCLucenePhraseQuery::getTerms() const' + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + src/assistant/help/help.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro +index ed75c37..a2c55c7 100644 +--- a/src/assistant/help/help.pro ++++ b/src/assistant/help/help.pro +@@ -70,3 +70,5 @@ HEADERS += qhelpenginecore.h \ + # access to clucene + HEADERS += qhelpsearchindexwriter_clucene_p.h \ + qhelpsearchindexreader_clucene_p.h ++ ++LIBS += -lQt5CLucene +-- +1.8.3.1 + diff --git a/recipes-qt/qt5/qttools_5.2.0.bb b/recipes-qt/qt5/qttools_5.2.0.bb new file mode 100644 index 0000000000..0effa1bfa5 --- /dev/null +++ b/recipes-qt/qt5/qttools_5.2.0.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" +SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" From faad8d1df1aee67f9d1a7e9ea3c13f92d04baf8e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 19 Jan 2014 12:09:14 +0100 Subject: [PATCH 289/347] qtmultimedia: Use PACKAGECONFIG for gstremer-0.10 and change it to disabled by default * it doesn't support gst-1.x like qtwebkit yet, disable it by default to build images without gst-0.10 where possible. Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 87269850ab..66133f4b9e 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,13 +1,17 @@ require qt5.inc -DEPENDS += "qtdeclarative gstreamer gst-plugins-base alsa-lib " +DEPENDS += "qtdeclarative alsa-lib" PACKAGECONFIG ??= "" PACKAGECONFIG[openal] = ",,openal-soft" +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" do_configure_prepend() { # disable openal test if it isn't enabled by PACKAGECONFIG sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro + # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG + sed -i 's/^\( *\)qtCompileTest(gstreamer)/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro } EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" From 0b8e8124ed8e6573516efa244b67b70a39874de8 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 24 Jan 2014 01:02:55 +0100 Subject: [PATCH 290/347] cmake-native: disable test for Qt5Core Fixes the same build error as 671313d, but for the -native recipe. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- .../cmake/cmake-native_2.8.12.1.bbappend | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend diff --git a/recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend b/recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend new file mode 100644 index 0000000000..ebacf720e6 --- /dev/null +++ b/recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend @@ -0,0 +1,20 @@ +# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable +# and possibly missing qmake binary (qtbase-native can be removed from sysroot +# e.g. in order to upgrade it, even when there is target qtbase) + +#| -- Performing Test run_pic_test - Success +#| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): +#| The imported target "Qt5::Core" references the file +#| +#| "/qmake" +#| +#| but this file does not exist. Possible reasons include: + +do_configure_prepend() { + sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt + sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake + sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt + sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt + sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt + sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt +} From 7cca3003fa653447d814ead3fd805bd87c5872fd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 29 Jan 2014 16:23:30 +0100 Subject: [PATCH 291/347] qtmultimedia.inc: Fix duplicating '{' Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 66133f4b9e..3b7e568264 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -10,7 +10,7 @@ do_configure_prepend() { # disable openal test if it isn't enabled by PACKAGECONFIG sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG - sed -i 's/^\( *\)qtCompileTest(gstreamer)/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro + sed -i 's/^\( *\)qtCompileTest(gstreamer) {/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro } EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" From a317282d25c1355e085de80b71a0b199c773bb8b Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 28 Jan 2014 21:19:01 +0100 Subject: [PATCH 292/347] qtwebkit: drop obsolete patch 0001-jsc-Add-licuuc-licui18n-LIBS.patch This patch caused a linker error: | linking ../../bin/jsc | [...]ld: cannot find -licuuc -licui18n The linker command-line contains: | [...] -licuuc\ -licui18n [...] -licui18n -licuuc -licudata [...] So the problem gets caused by the backslash, making the actual library name "libicuuc -licui18n.so". This may have been caused be the double quotes used in the patch. However, since both libs are already part of the command-line, the patch can just get dropped. The patch indicates, that it was created for a beta version, so I assume that this was fixed before the 5.2 release. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 1 - .../0001-jsc-Add-licuuc-licui18n-LIBS.patch | 443 ------------------ 2 files changed, 444 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 8f475d7d6c..f2b678ea8c 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -15,7 +15,6 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " SRC_URI += "file://fix-rpath.patch" -SRC_URI += "file://0001-jsc-Add-licuuc-licui18n-LIBS.patch" # make sure rb files are used from sysroot, not from host # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` diff --git a/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch b/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch deleted file mode 100644 index f9e97cb97d..0000000000 --- a/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch +++ /dev/null @@ -1,443 +0,0 @@ -From 19da0b2f95c4c4ad3cc35ea3c6bb34adf4886a32 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 15:47:13 +0100 -Subject: [PATCH] jsc: Add -licuuc -licui18n LIBS - -* fails to link without them: -OE @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore $ x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-O1 -o ../../bin/jsc .obj/release-shared/jsc.o -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lQt5Core -lpthread -lpthread /OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)': -Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)': -Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::nextTokenIsColon()': -Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)': -Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(YarrInterpreter.o): In function `JSC::Yarr::ByteCompiler::emitDisjunction(JSC::Yarr::PatternDisjunction*, unsigned int, unsigned int)': -YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1117): undefined reference to `u_tolower_51' -YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1126): undefined reference to `u_toupper_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(DatePrototype.o): In function `JSC::formatLocaleDate(JSC::ExecState*, JSC::DateInstance*, double, JSC::LocaleDateTimeFormat) [clone .isra.61]': -DatePrototype.cpp:(.text+0x57cc): undefined reference to `udat_open_51' -DatePrototype.cpp:(.text+0x57f8): undefined reference to `udat_format_51' -DatePrototype.cpp:(.text+0x5802): undefined reference to `udat_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(FunctionPrototype.o): In function `JSC::functionProtoFuncToString(JSC::ExecState*)': -FunctionPrototype.cpp:(.text+0x2666): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::isStrWhiteSpace(unsigned short)': -JSGlobalObjectFunctions.cpp:(.text+0x458): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::jsToNumber(WTF::String const&)': -JSGlobalObjectFunctions.cpp:(.text+0x789): undefined reference to `u_charType_51' -JSGlobalObjectFunctions.cpp:(.text+0x7bf): undefined reference to `u_charType_51' -JSGlobalObjectFunctions.cpp:(.text+0xc75): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o):JSGlobalObjectFunctions.cpp:(.text+0x1cd1): more undefined references to `u_charType_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(WTF::String const&, WTF::Vector&, WTF::Base64DecodePolicy)': -Base64.cpp:(.text+0x5c8): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(char const*, unsigned int, WTF::Vector&, WTF::Base64DecodePolicy)': -Base64.cpp:(.text+0x1441): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned char const*, unsigned char const*, unsigned int)': -StringImpl.cpp:(.text+0x6e4): undefined reference to `u_foldCase_51' -StringImpl.cpp:(.text+0x6f1): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned short const*, unsigned char const*, unsigned int)': -StringImpl.cpp:(.text+0x754): undefined reference to `u_foldCase_51' -StringImpl.cpp:(.text+0x761): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::findIgnoringCase(WTF::StringImpl*, unsigned int)': -StringImpl.cpp:(.text+0x2eb4): undefined reference to `u_memcasecmp_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::reverseFindIgnoringCase(WTF::StringImpl*, unsigned int)': -StringImpl.cpp:(.text+0x35f3): undefined reference to `u_memcasecmp_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(WTF::StringImpl const*, unsigned char const*)': -StringImpl.cpp:(.text+0x4139): undefined reference to `u_foldCase_51' -StringImpl.cpp:(.text+0x4149): undefined reference to `u_foldCase_51' -StringImpl.cpp:(.text+0x421d): undefined reference to `u_foldCase_51' -StringImpl.cpp:(.text+0x422d): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCaseNonNull(WTF::StringImpl const*, WTF::StringImpl const*)': -StringImpl.cpp:(.text+0x42a5): undefined reference to `u_memcasecmp_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::defaultWritingDirection(bool*)': -StringImpl.cpp:(.text+0x438b): undefined reference to `u_charDirection_51' -StringImpl.cpp:(.text+0x43b6): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::simplifyWhiteSpace()': -StringImpl.cpp:(.text+0x48b1): undefined reference to `u_charDirection_51' -StringImpl.cpp:(.text+0x48e1): undefined reference to `u_charDirection_51' -StringImpl.cpp:(.text+0x49f1): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o):StringImpl.cpp:(.text+0x4a19): more undefined references to `u_charDirection_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::lower()': -StringImpl.cpp:(.text+0x69bd): undefined reference to `u_strToLower_51' -StringImpl.cpp:(.text+0x6b51): undefined reference to `u_strToLower_51' -StringImpl.cpp:(.text+0x6c31): undefined reference to `u_tolower_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::foldCase()': -StringImpl.cpp:(.text+0x6cde): undefined reference to `u_tolower_51' -StringImpl.cpp:(.text+0x6d9e): undefined reference to `u_strFoldCase_51' -StringImpl.cpp:(.text+0x6e12): undefined reference to `u_strFoldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::upper()': -StringImpl.cpp:(.text+0x6f9f): undefined reference to `u_strToUpper_51' -StringImpl.cpp:(.text+0x7031): undefined reference to `u_strToUpper_51' -StringImpl.cpp:(.text+0x70ec): undefined reference to `u_toupper_51' -StringImpl.cpp:(.text+0x71ea): undefined reference to `u_toupper_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned char const*, unsigned long, bool*, int)': -WTFString.cpp:(.text+0x2d81): undefined reference to `u_charDirection_51' -WTFString.cpp:(.text+0x3031): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned short const*, unsigned long, bool*, int)': -WTFString.cpp:(.text+0x30c1): undefined reference to `u_charDirection_51' -WTFString.cpp:(.text+0x3331): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToUIntStrict(unsigned char const*, unsigned long, bool*, int)': -WTFString.cpp:(.text+0x3451): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o):WTFString.cpp:(.text+0x36b9): more undefined references to `u_charDirection_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::~Collator()': -CollatorICU.cpp:(.text+0x98): undefined reference to `ucol_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::createCollator() const': -CollatorICU.cpp:(.text+0x174): undefined reference to `ucol_getLocaleByType_51' -CollatorICU.cpp:(.text+0x18b): undefined reference to `ucol_getAttribute_51' -CollatorICU.cpp:(.text+0x1d0): undefined reference to `ucol_open_51' -CollatorICU.cpp:(.text+0x1f3): undefined reference to `ucol_open_51' -CollatorICU.cpp:(.text+0x211): undefined reference to `ucol_setAttribute_51' -CollatorICU.cpp:(.text+0x226): undefined reference to `ucol_setAttribute_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::releaseCollator()': -CollatorICU.cpp:(.text+0x368): undefined reference to `ucol_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::collate(unsigned short const*, unsigned long, unsigned short const*, unsigned long) const': -CollatorICU.cpp:(.text+0x2e6): undefined reference to `ucol_strcoll_51' -CollatorICU.cpp:(.text+0x327): undefined reference to `ucol_strcoll_51' -collect2: error: ld returned 1 exit status - -* and later when linking main library: -E @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source $ make -j 9 MAKEFLAGS='-j 9' OE_QMAKE_COMPILER='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CC='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CXX='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types' OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden' OE_QMAKE_LINK='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' OE_QMAKE_AR='x86_64-oe-linux-ar' OE_QMAKE_STRIP='echo' OE_QMAKE_WAYLAND_SCANNER='/OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/wayland-scanner' -f Makefile.api -rm -f libQt5WebKit.so.5.2.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.2 -x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--no-undefined -Wl,-O1 -shared -Wl,-Bsymbolic-functions -Wl,-soname,libQt5WebKit.so.5 -o libQt5WebKit.so.5.2.0 -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release -Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit2/release -lrt -Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release -lz -lXrender -ludev -lXcomposite -lXrender -ljpeg -lpng -Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/ThirdParty/ANGLE/release -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lXext -lX11 -lm -lX11 -lxslt -lxml2 -lz -lm -ldl -lm -lxml2 -lxml2 -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstapp-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstinterfaces-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstpbutils-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstvideo-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lsqlite3 -lQt5Quick -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Positioning -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sql -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sensors -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lGL -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)': -Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)': -Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::nextTokenIsColon()': -Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)': -Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': -FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xdc): undefined reference to `u_foldCase_51' -FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xf3): undefined reference to `u_foldCase_51' -FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51' -FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x313): undefined reference to `u_foldCase_51' -FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x357): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o):FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TypeAhead.o): In function `WebCore::TypeAhead::handleEvent(WebCore::KeyboardEvent*, unsigned int)': -TypeAhead.cpp:(.text._ZN7WebCore9TypeAhead11handleEventEPNS_13KeyboardEventEj+0x511): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CanvasRenderingContext2D.o): In function `WTF::isSpaceOrNewline(unsigned short)': -CanvasRenderingContext2D.cpp:(.text._ZN3WTFL16isSpaceOrNewlineEt+0x30): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginAccessControl.o): In function `WebCore::isOnAccessControlResponseHeaderWhitelist(WTF::String const&)': -CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x8c): undefined reference to `u_foldCase_51' -CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0xa3): undefined reference to `u_foldCase_51' -CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1dc): undefined reference to `u_foldCase_51' -CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1f3): undefined reference to `u_foldCase_51' -CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x226): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZNK7WebCore35CrossOriginPreflightResultCacheItem24allowsCrossOriginHeadersERKNS_13HTTPHeaderMapERN3WTF6StringE+0xac): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList(WTF::String const&, unsigned int, unsigned int, WTF::HashSet >&)': -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x19c): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList(WTF::String const&, unsigned int, unsigned int, WTF::HashSet >&)': -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x13c): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x153): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x254): undefined reference to `u_charDirection_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2d4): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2eb): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x327): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x45c): undefined reference to `u_foldCase_51' -CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x473): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x5cc): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ContextMenuController.o): In function `WebCore::selectionContainsPossibleWord(WebCore::Frame*)': -ContextMenuController.cpp:(.text._ZN7WebCoreL29selectionContainsPossibleWordEPNS_5FrameE+0x96): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontGlyphs.o): In function `WebCore::FontGlyphs::glyphDataAndPageForCharacter(WebCore::FontDescription const&, int, bool, WebCore::FontDataVariant) const': -FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x49d): undefined reference to `u_charMirror_51' -FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x5b6): undefined reference to `u_toupper_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Font.o): In function `WebCore::Font::canReceiveTextEmphasis(int)': -Font.cpp:(.text._ZN7WebCore4Font22canReceiveTextEmphasisEi+0x4): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o): In function `WTF::HashTableIterator >, WTF::KeyValuePairKeyExtractor > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits > >, WebCore::FontPlatformDataCacheKeyTraits> WTF::HashTable >, WTF::KeyValuePairKeyExtractor > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits > >, WebCore::FontPlatformDataCacheKeyTraits>::find, WebCore::FontPlatformDataCacheKey>(WebCore::FontPlatformDataCacheKey const&)': -FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0xec): undefined reference to `u_foldCase_51' -FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x100): undefined reference to `u_foldCase_51' -FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x23c): undefined reference to `u_foldCase_51' -FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x250): undefined reference to `u_foldCase_51' -FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x27f): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o):FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi]+0x17d): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(GraphicsContext.o): In function `WebCore::GraphicsContext::drawBidiText(WebCore::Font const&, WebCore::TextRun const&, WebCore::FloatPoint const&, WebCore::Font::CustomFontNotReadyAction)': -GraphicsContext.cpp:(.text._ZN7WebCore15GraphicsContext12drawBidiTextERKNS_4FontERKNS_7TextRunERKNS_10FloatPointENS1_24CustomFontNotReadyActionE+0x4de): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGGlyph.o): In function `WebCore::charactersWithArabicForm(WTF::String const&, bool)': -SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x59): undefined reference to `ublock_getCode_51' -SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x8e): undefined reference to `ublock_getCode_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SurrogatePairAwareTextIterator.o): In function `WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks()': -SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x28): undefined reference to `u_getCombiningClass_51' -SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x6d): undefined reference to `unorm_normalize_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal(WebCore::SurrogatePairAwareTextIterator&, WebCore::GlyphBuffer*)': -WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x109e): undefined reference to `u_toupper_51' -WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x10be): undefined reference to `u_toupper_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal(WebCore::Latin1TextIterator&, WebCore::GlyphBuffer*)': -WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x106f): undefined reference to `u_toupper_51' -WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x108d): undefined reference to `u_toupper_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WebCore::appendEncodedHostname(WTF::Vector&, unsigned short const*, unsigned int) [clone .part.54]': -KURL.cpp:(.text._ZN7WebCoreL21appendEncodedHostnameERN3WTF6VectorItLm512ENS0_15CrashOnOverflowEEEPKtj.part.54+0x39): undefined reference to `uidna_IDNToASCII_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': -KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' -KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' -KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' -KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' -KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o):KURL.cpp:(.text._ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj[_ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj]+0x7c): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Length.o): In function `WebCore::parseLength(unsigned short const*, unsigned int)': -Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x176): undefined reference to `u_charDirection_51' -Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x230): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o): In function `WTF::HashTable*>, WTF::KeyValuePairKeyExtractor*> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits*> >, WTF::HashTraits >::rehash(int)': -MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' -MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' -MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51' -MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x313): undefined reference to `u_foldCase_51' -MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x358): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o):MIMETypeRegistry.cpp:(.text._ZN7WebCoreL16mediaMIMETypeMapEv+0xcc): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTTPParsers.o): In function `WebCore::extractMIMETypeFromMediaType(WTF::String const&)': -HTTPParsers.cpp:(.text._ZN7WebCore28extractMIMETypeFromMediaTypeERKN3WTF6StringE+0x1a4): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceRequestBase.o): In function `WebCore::ResourceRequestBase::setHTTPHeaderField(WTF::AtomicString const&, WTF::String const&)': -ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x9d): undefined reference to `u_foldCase_51' -ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0xb5): undefined reference to `u_foldCase_51' -ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x31f): undefined reference to `u_foldCase_51' -ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x36d): undefined reference to `u_foldCase_51' -ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x385): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceResponseBase.o):ResourceResponseBase.cpp:(.text._ZN7WebCore20ResourceResponseBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x8c): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `charCat(unsigned short) [clone .part.4]': -XPathParser.cpp:(.text._ZL7charCatt.part.4+0x8): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `WebCore::XPath::Parser::skipWS()': -XPathParser.cpp:(.text._ZN7WebCore5XPath6Parser6skipWSEv+0x3d): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::addAllCodePoints(USet*, WTF::String const&)': -SmartReplaceICU.cpp:(.text._ZN7WebCoreL16addAllCodePointsEP4USetRKN3WTF6StringE+0x46): undefined reference to `uset_add_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)': -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x2b): undefined reference to `uset_contains_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x7e): undefined reference to `uset_openPattern_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x93): undefined reference to `uset_addRange_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xa5): undefined reference to `uset_addRange_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xb7): undefined reference to `uset_addRange_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xc9): undefined reference to `uset_addRange_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xdb): undefined reference to `uset_addRange_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o):SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xed): more undefined references to `uset_addRange_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)': -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x209): undefined reference to `uset_openPattern_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x217): undefined reference to `uset_addAll_51' -SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x21f): undefined reference to `uset_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o): In function `WTF::HashTable (*)(WebCore::KURL const&, WebCore::SharedBuffer*)>, WTF::KeyValuePairKeyExtractor (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::HashTraits >::rehash(int)': -ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' -ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' -ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' -ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' -ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o):ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGAllInOne.o): In function `WebCore::SVGFontData::createStringWithMirroredCharacters(unsigned short const*, unsigned int) const': -SVGAllInOne.cpp:(.text._ZNK7WebCore11SVGFontData34createStringWithMirroredCharactersEPKtj+0x129): undefined reference to `u_charMirror_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::(anonymous namespace)::parseToken(unsigned short const*, unsigned short const*, unsigned short const**, unsigned short const**)': -InspectorAllInOne.cpp:(.text._ZN7WebCore12_GLOBAL__N_110parseTokenEPKtS2_PS2_S3_+0x49): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorStyleTextEditor::internalReplaceProperty(WebCore::InspectorStyleProperty const&, WTF::String const&, WebCore::SourceRange*, unsigned int*)': -InspectorAllInOne.cpp:(.text._ZN7WebCore24InspectorStyleTextEditor23internalReplacePropertyERKNS_22InspectorStylePropertyERKN3WTF6StringEPNS_11SourceRangeEPj+0x43a): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorResourceAgent::willLoadXHR(WebCore::ThreadableLoaderClient*, WTF::String const&, WebCore::KURL const&, bool, WTF::PassRefPtr, WebCore::HTTPHeaderMap const&, bool)': -InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x12c): undefined reference to `u_foldCase_51' -InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x13b): undefined reference to `u_foldCase_51' -InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3cc): undefined reference to `u_foldCase_51' -InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3db): undefined reference to `u_foldCase_51' -InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x411): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::setUpIterator(bool&, WebCore::TextBreakIterator*&, UBreakIteratorType, unsigned short const*, int)': -TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x3e): undefined reference to `ubrk_setText_51' -TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x80): undefined reference to `ubrk_open_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackEscape(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': -TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51' -TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x90): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackSubstitute(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': -TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51' -TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x98): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textClone(UText*, UText const*, signed char, UErrorCode*)': -TextAllInOne.cpp:(.text._ZN7WebCoreL9textCloneEP5UTextPKS0_aP10UErrorCode+0x27): undefined reference to `utext_setup_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::endOfFirstWordBoundaryContext(unsigned short const*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x26): undefined reference to `u_getIntPropertyValue_51' -TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x84): undefined reference to `u_getIntPropertyValue_51' -TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0xa6): undefined reference to `u_getIntPropertyValue_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::startOfLastWordBoundaryContext(unsigned short const*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x1e): undefined reference to `u_getIntPropertyValue_51' -TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x77): undefined reference to `u_getIntPropertyValue_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o):TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x96): more undefined references to `u_getIntPropertyValue_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::NonSharedCharacterBreakIterator::~NonSharedCharacterBreakIterator()': -TextAllInOne.cpp:(.text._ZN7WebCore31NonSharedCharacterBreakIteratorD2Ev+0x24): undefined reference to `ubrk_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numGraphemeClusters(WTF::String const&)': -TextAllInOne.cpp:(.text._ZN7WebCore19numGraphemeClustersERKN3WTF6StringE+0x48): undefined reference to `ubrk_next_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numCharactersInGraphemeClusters(WTF::String const&, unsigned int)': -TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0x9d): undefined reference to `ubrk_next_51' -TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0xe9): undefined reference to `ubrk_current_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFirst(WebCore::TextBreakIterator*)': -TextAllInOne.cpp:(.text._ZN7WebCore14textBreakFirstEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_first_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakNext(WebCore::TextBreakIterator*)': -TextAllInOne.cpp:(.text._ZN7WebCore13textBreakNextEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_next_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakPreceding(WebCore::TextBreakIterator*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore18textBreakPrecedingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_preceding_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFollowing(WebCore::TextBreakIterator*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore18textBreakFollowingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_following_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakCurrent(WebCore::TextBreakIterator*)': -TextAllInOne.cpp:(.text._ZN7WebCore16textBreakCurrentEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_current_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isTextBreak(WebCore::TextBreakIterator*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore11isTextBreakEPNS_17TextBreakIteratorEi+0x5): undefined reference to `ubrk_isBoundary_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isWordTextBreak(WebCore::TextBreakIterator*)': -TextAllInOne.cpp:(.text._ZN7WebCore15isWordTextBreakEPNS_17TextBreakIteratorE+0x5): undefined reference to `ubrk_getRuleStatus_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::cursorMovementIterator(unsigned short const*, int)': -TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0x43): undefined reference to `ubrk_setText_51' -TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0xb3): undefined reference to `ubrk_openRules_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::urlEscapedEntityCallback(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': -TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x1a): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' -TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x59): undefined reference to `ucnv_cbFromUWriteBytes_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkUrlEscapedEntityCallack(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)': -TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x65): undefined reference to `ucnv_cbFromUWriteUChars_51' -TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x9d): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::ICUConverterWrapper::~ICUConverterWrapper()': -TextAllInOne.cpp:(.text._ZN7WebCore19ICUConverterWrapperD2Ev+0x9): undefined reference to `ucnv_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerEncodingNames(void (*)(char const*, char const*))': -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x21): undefined reference to `ucnv_countAvailable_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x56): undefined reference to `ucnv_getStandardName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x7e): undefined reference to `ucnv_getAvailableName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x9b): undefined reference to `ucnv_getStandardName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x136): undefined reference to `ucnv_countAliases_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x182): undefined reference to `ucnv_getAlias_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerCodecs(void (*)(char const*, WTF::PassOwnPtr (*)(WebCore::TextEncoding const&, void const*), void const*))': -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x38): undefined reference to `ucnv_getCanonicalName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x51): undefined reference to `ucnv_countAvailable_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x7e): undefined reference to `ucnv_getStandardName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xa0): undefined reference to `ucnv_getAvailableName_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xbd): undefined reference to `ucnv_getStandardName_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::releaseICUConverter() const': -TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x42): undefined reference to `ucnv_close_51' -TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x4b): undefined reference to `ucnv_reset_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::createICUConverter() const': -TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x79): undefined reference to `ucnv_getName_51' -TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x95): undefined reference to `ucnv_open_51' -TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0xab): undefined reference to `ucnv_setFallback_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::decode(char const*, unsigned long, bool, bool, bool&)': -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x49): undefined reference to `UCNV_TO_U_CALLBACK_SUBSTITUTE_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x73): undefined reference to `ucnv_setToUCallBack_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x122): undefined reference to `ucnv_toUnicode_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x183): undefined reference to `ucnv_toUnicode_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x25d): undefined reference to `ucnv_setToUCallBack_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextEncoding::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling) const': -TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x68): undefined reference to `unorm_quickCheck_51' -TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x9d): undefined reference to `unorm_normalize_51' -TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x1bf): undefined reference to `unorm_normalize_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling)': -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x13f): undefined reference to `ucnv_fromUnicode_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x198): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x1b5): undefined reference to `ucnv_setFromUCallBack_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x31c): undefined reference to `ucnv_setSubstChars_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x330): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51' -TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x343): undefined reference to `ucnv_setFromUCallBack_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned char const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)': -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x174): undefined reference to `utext_setup_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1c9): undefined reference to `ubrk_setUText_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1dd): undefined reference to `utext_close_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x2ac): undefined reference to `ubrk_open_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x356): undefined reference to `ubrk_open_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned short const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)': -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x168): undefined reference to `utext_setup_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1bd): undefined reference to `ubrk_setUText_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1d1): undefined reference to `utext_close_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x29c): undefined reference to `ubrk_open_51' -TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x346): undefined reference to `ubrk_open_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::releaseLineBreakIterator(WebCore::TextBreakIterator*)': -TextAllInOne.cpp:(.text._ZN7WebCore24releaseLineBreakIteratorEPNS_17TextBreakIteratorE+0x190): undefined reference to `ubrk_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::detectTextEncoding(char const*, unsigned long, char const*, WebCore::TextEncoding*)': -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x40): undefined reference to `ucsdet_open_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x6c): undefined reference to `ucsdet_enableInputFilter_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x7d): undefined reference to `ucsdet_setText_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x95): undefined reference to `ucsdet_detectAll_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x100): undefined reference to `ucsdet_getConfidence_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x118): undefined reference to `ucsdet_getName_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x14d): undefined reference to `ucsdet_close_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x16c): undefined reference to `ucsdet_getName_51' -TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x197): undefined reference to `ucsdet_close_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::StringImpl** WTF::HashTable, WTF::HashTraits >::lookup, WTF::StringImpl*>(WTF::StringImpl* const&)': -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x64): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x7b): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x197): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x1fc): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x20b): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x286): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WebCore::HTMLSelectElement::defaultEventHandler(WebCore::Event*)': -HTMLElementsAllInOne.cpp:(.text._ZN7WebCore17HTMLSelectElement19defaultEventHandlerEPNS_5EventE+0xbe): undefined reference to `u_isprint_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::HashTable, WTF::HashTraits >::rehash(int)': -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x11e): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2ac): undefined reference to `u_foldCase_51' -HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2c3): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x337): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::searcher()': -EditingAllInOne.cpp:(.text._ZN7WebCoreL8searcherEv+0xba): undefined reference to `usearch_open_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::normalizeCharacters(unsigned short const*, unsigned int, WTF::Vector&)': -EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0x4c): undefined reference to `unorm_normalize_51' -EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0xa3): undefined reference to `unorm_normalize_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::SearchBuffer::search(unsigned long&)': -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x55): undefined reference to `usearch_setText_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x63): undefined reference to `usearch_setOffset_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x6e): undefined reference to `usearch_next_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xb7): undefined reference to `usearch_getMatchedLength_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x1d7): undefined reference to `usearch_next_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x7b4): undefined reference to `u_charType_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x8f2): undefined reference to `u_charType_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x9c4): undefined reference to `u_charType_51' -EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xad8): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WTF::HashTable, WTF::KeyValuePairKeyExtractor >, WTF::CaseFoldingHash, WTF::HashMapValueTraits, WTF::HashTraits >, WTF::HashTraits >::rehash(int)': -EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51' -EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51' -EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51' -EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x303): undefined reference to `u_foldCase_51' -EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x348): undefined reference to `u_foldCase_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o):EditingAllInOne.cpp:(.text._ZN7WebCoreL15internalCommandERKN3WTF6StringE+0x8c): more undefined references to `u_foldCase_51' follow -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::findPlainText(WebCore::Range const*, WTF::String const&, unsigned int)': -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x539): undefined reference to `usearch_getCollator_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x555): undefined reference to `ucol_getStrength_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x565): undefined reference to `ucol_setStrength_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x56d): undefined reference to `usearch_reset_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x5a1): undefined reference to `usearch_setPattern_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x75f): undefined reference to `usearch_setPattern_51' -EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0xf29): undefined reference to `u_charType_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::VisibleSelection::appendTrailingWhitespace()': -EditingAllInOne.cpp:(.text._ZN7WebCore16VisibleSelection24appendTrailingWhitespaceEv+0x305): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::WordAwareIterator::advance()': -EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x341): undefined reference to `u_charDirection_51' -EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x3a9): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::previousBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))': -EditingAllInOne.cpp:(.text._ZN7WebCoreL16previousBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0x1a0): undefined reference to `u_getIntPropertyValue_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::nextBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))': -EditingAllInOne.cpp:(.text._ZN7WebCoreL12nextBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0xe1): undefined reference to `u_getIntPropertyValue_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::Editor::insertTextWithoutSendingTextEvent(WTF::String const&, bool, WebCore::TextEvent*)': -EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3cb): undefined reference to `u_ispunct_51' -EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3d8): undefined reference to `u_charDirection_51' -/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWe -... - -Signed-off-by: Martin Jansa ---- - Source/JavaScriptCore/jsc.pro | 2 ++ - Source/api.pri | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro -index dfd73e8..ef6e55d 100644 ---- a/Source/JavaScriptCore/jsc.pro -+++ b/Source/JavaScriptCore/jsc.pro -@@ -27,6 +27,8 @@ wince* { - LIBS += mmtimer.lib - } - -+LIBS += "-licuuc -licui18n" -+ - # Prevent warnings about difference in visibility on Mac OS X - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -diff --git a/Source/api.pri b/Source/api.pri -index ccd206c..39c56dd 100644 ---- a/Source/api.pri -+++ b/Source/api.pri -@@ -29,6 +29,8 @@ use?(3D_GRAPHICS): WEBKIT += angle - MODULE = webkit - CONFIG += creating_module - -+LIBS += "-licuuc -licui18n" -+ - # This is the canonical list of dependencies for the public API of - # the QtWebKit library, and will end up in the library's prl file. - QT_API_DEPENDS = core gui network --- -1.8.4.3 - From 91ac66d5e4867d7e400bbffe5b31caa8ed660fbb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Feb 2014 10:50:59 -0200 Subject: [PATCH 293/347] README: Reword the section about github forking This splits the lines in 80 cols and rework the text a little bit to easy reading. Signed-off-by: Otavio Salvador --- README | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README b/README index a5a5812845..06335bba5a 100644 --- a/README +++ b/README @@ -18,7 +18,14 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-qt5] When sending single patches, please using something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-qt5][PATCH' -You are encouraged to fork the mirror on github https://github.com/meta-qt5/meta-qt5/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. +You are encouraged to fork the mirror on github[1] to share your +patches. This is preferred for patch sets consisting of more than one +patch. Other services like gitorious, repo.or.cz or self hosted setups +are of course accepted as well, 'git fetch ' works the same on +all of them. We recommend github because it is free, easy to use, has +been proven to be reliable and has a really good web GUI. + +1. https://github.com/meta-qt5/meta-qt5/ Main layer maintainers: Martin 'JaMa' Jansa From d768d975282b8a230314880ab6acd334440a6214 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 5 Feb 2014 23:05:21 -0200 Subject: [PATCH 294/347] nativesdk-packagegroup-qt5-toolchain-host: Add packagegroup Allow easy inclusion of host packages for the Qt5 standalone SDK or external toolchain. Signed-off-by: Otavio Salvador --- .../nativesdk-packagegroup-qt5-toolchain-host.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb new file mode 100644 index 0000000000..4cc0b93051 --- /dev/null +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. + +SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain" +LICENSE = "MIT" + +inherit nativesdk packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + nativesdk-packagegroup-sdk-host \ + nativesdk-qttools \ + nativesdk-qtbase-tools \ +" From 3cc5613d226d95f5f4e802856f507efaf44cb968 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Feb 2014 11:38:17 -0200 Subject: [PATCH 295/347] packagegroup-qt5-toolchain-target: Add packagegroup Allow easy inclusion of target packages for the Qt5 SDK or external toolchain. The list of the target package is based on the Arago Project, which has been contribute by Denys Dmytriyenko . Signed-off-by: Otavio Salvador --- .../packagegroup-qt5-toolchain-target.bb | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb new file mode 100644 index 0000000000..997df189ab --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -0,0 +1,40 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. + +DESCRIPTION = "Target packages for Qt5 SDK" +LICENSE = "MIT" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +# Requires meta-ruby to work +USE_RUBY = " \ + qtwebkit-mkspecs \ + qtwebkit-dev \ +" + +RDEPENDS_${PN} += " \ + packagegroup-core-standalone-sdk-target \ + libsqlite3-dev \ + qtbase-mkspecs \ + qtscript-mkspecs \ + qtxmlpatterns-mkspecs \ + qtdeclarative-mkspecs \ + qtsensors-mkspecs \ + qt3d-mkspecs \ + qtlocation-mkspecs \ + qtsvg-mkspecs \ + qtbase-dev \ + qtdeclarative-dev \ + qtscript-dev \ + qt3d-dev \ + qtlocation-dev \ + qtsensors-dev \ + qtsvg-dev \ + qtxmlpatterns-dev \ + qtdeclarative-dev \ + qtdeclarative-plugins \ + qtdeclarative-qmlplugins \ + qtgraphicaleffects-dev \ + ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \ +" From f803570841608ec5e81675e4b85613fbf0062839 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 6 Feb 2014 09:09:01 -0200 Subject: [PATCH 296/347] populate_sdk_qt5.bbclass: Allow generation of toolchain This allow the toolchain generation using '-c populate_sdk' as it includes the need host libraries into the SDK. Signed-off-by: Denys Dmytriyenko Signed-off-by: Otavio Salvador --- classes/populate_sdk_qt5.bbclass | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 classes/populate_sdk_qt5.bbclass diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass new file mode 100644 index 0000000000..3b849e9fff --- /dev/null +++ b/classes/populate_sdk_qt5.bbclass @@ -0,0 +1,54 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. + +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target" + +# This allow reuse of Qt paths +inherit qmake5_paths + +toolchain_create_sdk_env_script_append () { + echo 'export PATH=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}:$PATH' >> $script + echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script + echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script + echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script + echo 'export OE_QMAKE_CC=$CC' >> $script + echo 'export OE_QMAKE_CXX=$CXX' >> $script + echo 'export OE_QMAKE_LINK=$CXX' >> $script + echo 'export OE_QMAKE_AR=$AR' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_HEADERS}' >> $script + echo 'export OE_QMAKE_MOC=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/moc' >> $script + echo 'export OE_QMAKE_UIC=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/uic' >> $script + echo 'export OE_QMAKE_RCC=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script + echo 'export OE_QMAKE_QDBUSCPP2XML=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script + echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script + echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script + echo 'export QMAKESPEC=${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}/${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script + echo 'export QT_CONF_PATH=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script + + # make a symbolic link to mkspecs for compatibility with QTCreator + (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; \ + ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;) + + # Generate a qt.conf file to be deployed with the SDK + qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf + touch $qtconf + echo '[Paths]' >> $qtconf + echo 'Prefix = ${SDKTARGETSYSROOT}' >> $qtconf + echo 'Headers = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf + echo 'Libraries = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}' >> $qtconf + echo 'ArchData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf + echo 'Data = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_DATA}' >> $qtconf + echo 'Binaries = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_BINS}' >> $qtconf + echo 'LibraryExecutables = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf + echo 'Plugins = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_PLUGINS}' >> $qtconf + echo 'Imports = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_IMPORTS}' >> $qtconf + echo 'Qml2Imports = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QML}' >> $qtconf + echo 'Translations = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf + echo 'Documentation = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf + echo 'Settings = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf + echo 'Examples = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf + echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf + echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf + echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf +} From db9d6b401c101685dfb89557e06e451dcc0af1f0 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 10 Feb 2014 16:16:55 -0500 Subject: [PATCH 297/347] meta-toolchain-qt5: add Qt5 SDK standalone meta recipe Signed-off-by: Denys Dmytriyenko --- recipes-qt/meta/meta-toolchain-qt5.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipes-qt/meta/meta-toolchain-qt5.bb diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb b/recipes-qt/meta/meta-toolchain-qt5.bb new file mode 100644 index 0000000000..8991176590 --- /dev/null +++ b/recipes-qt/meta/meta-toolchain-qt5.bb @@ -0,0 +1,7 @@ +SUMMARY = "Meta package for building an installable Qt5 toolchain and SDK" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit populate_sdk populate_sdk_qt5 From 7c5306107c60b1a1e0bb8c4c3b8b80afa59a426a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 14 Feb 2014 18:58:40 -0200 Subject: [PATCH 298/347] nativesdk-qtbase: Fix install error in case install task is rerun In case changes are done in do_install and the sstate checksums change, the task would fail as the qmake binary has already been replaced. Avoid this error checking for the original filename. Signed-off-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index c4ef6e80e5..36bc334a40 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -178,8 +178,10 @@ do_install() { find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" # switch back the proper qmake - rm ${B}/bin/qmake - mv ${B}/bin/qmake-real ${B}/bin/qmake + if [ -e ${B}/bin/qmake-real ]; then + rm ${B}/bin/qmake + mv ${B}/bin/qmake-real ${B}/bin/qmake + fi oe_runmake install INSTALL_ROOT=${D} From 7d8f8d6b5a00af7a212cce41350f4e1c5989aabd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 14 Feb 2014 19:00:40 -0200 Subject: [PATCH 299/347] nativesdk-qtbase.inc: Remove unused contents Fixes: ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so ... Signed-off-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 36bc334a40..fe80c9bcf2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -188,4 +188,8 @@ do_install() { # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt + + # remove things unused in nativesdk; things are statically link + # and we just use the binaries so drop all unused files + rm -rf ${D}${includedir} ${D}${libdir} ${D}${datadir}/doc } From 8da5017712a7ddcb8488e095b9aa03b0273f23e9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 17 Feb 2014 11:30:58 -0300 Subject: [PATCH 300/347] nativesdk-qtbase.inc: Fix build failure removal of include and mkspecs The 7d8f8d6 change (nativesdk-qtbase.inc: Remove unused contents) introduced a build failure that was not catch in my test. This patch fixes it avoiding removing the headers and mkspecs files which are need for the nativesdk-qttools recipe. Signed-off-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index fe80c9bcf2..a7809d31f1 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -31,15 +31,27 @@ SRC_URI += " \ file://0012-configure-bump-path-length-from-256-to-512-character.patch \ " -PACKAGES = "${PN}-tools-dbg ${PN}-tools" +PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" +FILES_${PN}-tools-dev = " \ + ${includedir} \ + ${FILES_SOLIBSDEV} ${libdir}/*.la \ + ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ +" + +FILES_${PN}-tools-staticdev = " \ + ${libdir}/libQt5Bootstrap.a \ +" + FILES_${PN}-tools-dbg = " \ + ${libdir}/.debug \ ${OE_QMAKE_PATH_BINS}/.debug \ " FILES_${PN}-tools = " \ + ${libdir}/lib*${SOLIBS} \ ${OE_QMAKE_PATH_BINS}/* \ " @@ -189,7 +201,14 @@ do_install() { # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt - # remove things unused in nativesdk; things are statically link - # and we just use the binaries so drop all unused files - rm -rf ${D}${includedir} ${D}${libdir} ${D}${datadir}/doc + # remove things unused in nativesdk, we need the headers, Qt5Core + # and Qt5Bootstrap. + rm -rf ${D}${datadir}/doc \ + ${D}/${OE_QMAKE_PATH_PLUGINS} \ + ${D}${libdir}/cmake \ + ${D}${libdir}/pkgconfig + find ${D}${libdir} -maxdepth 1 -name 'lib*' -and \ + -not -name 'libQt5Core.so*' -and \ + -not -name 'libQt5Bootstrap.a' \ + -exec rm '{}' ';' } From 578657f7b6468af31ba399b02a4dac3c353db71b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 17 Feb 2014 15:01:31 -0300 Subject: [PATCH 301/347] qmake5_base.bbclass: Fix mkspec path when building nativesdk binaries When building nativesdk binaries we ought to rely in the native mkspecs. Signed-off-by: Otavio Salvador Acked-by: Denys Dmytriyenko --- classes/qmake5_base.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 2db0fa32a9..3861cd01af 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -4,6 +4,7 @@ QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}/${QT_DIR_NAME}" QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" +QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++" From 32cee0b6d18a9e8ae2977accf2c8d32f303827d7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 17 Feb 2014 16:58:14 -0300 Subject: [PATCH 302/347] nativesdk-qttools.inc: Fix installation and packaging We must to fix the installation paths as did in nativesdk-qtbase.inc and remove the files unused from the packages. This fixes the packaging errors and allows for a successful build for SDK. Signed-off-by: Otavio Salvador Acked-by: Denys Dmytriyenko --- recipes-qt/qt5/nativesdk-qttools.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc index e9b294984d..494c7b880b 100644 --- a/recipes-qt/qt5/nativesdk-qttools.inc +++ b/recipes-qt/qt5/nativesdk-qttools.inc @@ -21,5 +21,11 @@ do_configure() { } do_install() { + # Fix install paths for all + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" + oe_runmake install INSTALL_ROOT=${D} + + # remove things unused in nativesdk + rm -rf ${D}${libdir} } From 6e71d92786b1560f12c5f0bb06d62ad2d0e601b5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Feb 2014 10:04:05 -0300 Subject: [PATCH 303/347] nativesdk-qtbase: Remove the datadir as it is not installed Fixes: ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share Signed-off-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index a7809d31f1..54626d3565 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -203,7 +203,7 @@ do_install() { # remove things unused in nativesdk, we need the headers, Qt5Core # and Qt5Bootstrap. - rm -rf ${D}${datadir}/doc \ + rm -rf ${D}${datadir} \ ${D}/${OE_QMAKE_PATH_PLUGINS} \ ${D}${libdir}/cmake \ ${D}${libdir}/pkgconfig From 79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 Mon Sep 17 00:00:00 2001 From: Gabe Johnson Date: Mon, 3 Feb 2014 14:14:14 -0600 Subject: [PATCH 304/347] nativesdk-qtbase, nativesdk-qttools: Fix file search paths * this is useful for using newer meta-qt5 with older oe-core release Signed-off-by: Gabe Johnson Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase.inc | 3 +++ recipes-qt/qt5/nativesdk-qttools.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 54626d3565..fa4400947d 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -7,6 +7,9 @@ QT_MODULE = "qtbase" require nativesdk-qt5.inc +# it's already included with newer oe-core, but include it here for dylan +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" + # common with -native and target version SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc index 494c7b880b..c67f9cdf67 100644 --- a/recipes-qt/qt5/nativesdk-qttools.inc +++ b/recipes-qt/qt5/nativesdk-qttools.inc @@ -4,6 +4,9 @@ QT_MODULE = "qttools" require nativesdk-qt5.inc +# it's already included with newer oe-core, but include it here for dylan +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:" + SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch" PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" From 4b7182a3be2b591e8190ff15b7a121191e4b201f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Feb 2014 04:10:06 +0100 Subject: [PATCH 305/347] qt5: Upgrade from 5.2.0 to 5.2.1 * qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 4 +-- recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb | 5 --- recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb | 5 +++ recipes-qt/qt5/nativesdk-qttools_5.2.0.bb | 5 --- recipes-qt/qt5/nativesdk-qttools_5.2.1.bb | 5 +++ recipes-qt/qt5/qt3d_git.bb | 2 +- .../qt5/{qt5-5.2.0.inc => qt5-5.2.1.inc} | 0 recipes-qt/qt5/qt5-git.inc | 4 +-- ...native_5.2.0.bb => qtbase-native_5.2.1.bb} | 4 +-- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase.inc | 1 - .../qtbase/0001-Add-linux-oe-g-platform.patch | 14 ++++---- ...ow-to-set-qt.conf-from-the-outside-u.patch | 4 +-- .../0003-Add-external-hostbindir-option.patch | 22 ++++++------ ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 6 ++-- ...-qt_module-Fix-pkgconfig-replacement.patch | 8 ++--- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 6 ++-- ...Allow-to-add-extra-arguments-to-make.patch | 4 +-- ...ulseaudio-alsa-freetype-a-configurab.patch | 11 +++--- ...KE_PATH_EXTERNAL_HOST_BINS-to-determ.patch | 8 ++--- .../qt5/qtbase/0010-Always-build-uic.patch | 4 +-- ...ke-is-already-built-in-qtbase-native.patch | 8 ++--- ...ding-a-separate-qmake-for-the-target.patch | 4 +-- ...ve-built-qmake-and-swap-with-native-.patch | 8 ++--- ...ath-length-from-256-to-512-character.patch | 8 ++--- .../0012-qtbase-allow-build-of-examples.patch | 4 +-- ...-QOpenGLPaintDevice-sub-area-support.patch | 4 +-- ...-device-to-be-read-from-env-variable.patch | 35 ------------------- recipes-qt/qt5/qtbase_5.2.0.bb | 5 --- recipes-qt/qt5/qtbase_5.2.1.bb | 5 +++ recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_5.2.1.bb | 5 +++ recipes-qt/qt5/qtconnectivity_git.bb | 2 +- .../0001-qmltestexample-fix-link.patch | 11 +++--- ...culation-of-viewPort-for-transitions.patch | 8 ++--- recipes-qt/qt5/qtdeclarative_5.2.0.bb | 5 --- recipes-qt/qt5/qtdeclarative_5.2.1.bb | 5 +++ recipes-qt/qt5/qtdeclarative_git.bb | 3 +- recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb | 5 --- recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb | 5 +++ recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_5.2.0.bb | 5 --- recipes-qt/qt5/qtimageformats_5.2.1.bb | 5 +++ recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_5.2.1.bb | 5 +++ recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.2.0.bb | 5 --- recipes-qt/qt5/qtmultimedia_5.2.1.bb | 5 +++ recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_5.2.0.bb | 5 --- recipes-qt/qt5/qtquick1_5.2.1.bb | 5 +++ recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_5.2.0.bb | 6 ---- recipes-qt/qt5/qtquickcontrols_5.2.1.bb | 6 ++++ recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_5.2.0.bb | 5 --- recipes-qt/qt5/qtscript_5.2.1.bb | 5 +++ recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_5.2.0.bb | 5 --- recipes-qt/qt5/qtsensors_5.2.1.bb | 5 +++ recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialport_5.2.0.bb | 5 --- recipes-qt/qt5/qtserialport_5.2.1.bb | 5 +++ recipes-qt/qt5/qtserialport_git.bb | 3 +- recipes-qt/qt5/qtsvg_5.2.0.bb | 6 ---- recipes-qt/qt5/qtsvg_5.2.1.bb | 6 ++++ recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 6 ++-- recipes-qt/qt5/qttools-native_5.2.0.bb | 5 --- recipes-qt/qt5/qttools-native_5.2.1.bb | 5 +++ recipes-qt/qt5/qttools-native_git.bb | 2 +- ...build-only-lrelease-lupdate-lconvert.patch | 6 ++-- ...p-fix-linking-of-dependent-libraries.patch | 6 ++-- recipes-qt/qt5/qttools_5.2.0.bb | 5 --- recipes-qt/qt5/qttools_5.2.1.bb | 5 +++ recipes-qt/qt5/qttools_git.bb | 4 +++ recipes-qt/qt5/qtwayland-native.inc | 5 --- recipes-qt/qt5/qtwayland-native_git.bb | 5 ++- recipes-qt/qt5/qtwayland.inc | 5 --- recipes-qt/qt5/qtwayland_git.bb | 4 +-- recipes-qt/qt5/qtwebkit-examples_5.2.0.bb | 5 --- recipes-qt/qt5/qtwebkit-examples_5.2.1.bb | 5 +++ recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- recipes-qt/qt5/qtwebkit.inc | 2 +- ...0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 31 ++++++++++++++++ recipes-qt/qt5/qtwebkit/fix-rpath.patch | 13 ------- recipes-qt/qt5/qtwebkit_5.2.0.bb | 5 --- recipes-qt/qt5/qtwebkit_5.2.1.bb | 5 +++ recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtx11extras_5.2.0.bb | 5 --- recipes-qt/qt5/qtx11extras_5.2.1.bb | 5 +++ recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.2.0.bb | 5 --- recipes-qt/qt5/qtxmlpatterns_5.2.1.bb | 5 +++ recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 95 files changed, 256 insertions(+), 267 deletions(-) delete mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb delete mode 100644 recipes-qt/qt5/nativesdk-qttools_5.2.0.bb create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.2.1.bb rename recipes-qt/qt5/{qt5-5.2.0.inc => qt5-5.2.1.inc} (100%) rename recipes-qt/qt5/{qtbase-native_5.2.0.bb => qtbase-native_5.2.1.bb} (63%) delete mode 100644 recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch delete mode 100644 recipes-qt/qt5/qtbase_5.2.0.bb create mode 100644 recipes-qt/qt5/qtbase_5.2.1.bb create mode 100644 recipes-qt/qt5/qtconnectivity_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_5.2.0.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtimageformats_5.2.0.bb create mode 100644 recipes-qt/qt5/qtimageformats_5.2.1.bb create mode 100644 recipes-qt/qt5/qtlocation_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtmultimedia_5.2.0.bb create mode 100644 recipes-qt/qt5/qtmultimedia_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtquick1_5.2.0.bb create mode 100644 recipes-qt/qt5/qtquick1_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.2.0.bb create mode 100644 recipes-qt/qt5/qtquickcontrols_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtscript_5.2.0.bb create mode 100644 recipes-qt/qt5/qtscript_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtsensors_5.2.0.bb create mode 100644 recipes-qt/qt5/qtsensors_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtserialport_5.2.0.bb create mode 100644 recipes-qt/qt5/qtserialport_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtsvg_5.2.0.bb create mode 100644 recipes-qt/qt5/qtsvg_5.2.1.bb delete mode 100644 recipes-qt/qt5/qttools-native_5.2.0.bb create mode 100644 recipes-qt/qt5/qttools-native_5.2.1.bb delete mode 100644 recipes-qt/qt5/qttools_5.2.0.bb create mode 100644 recipes-qt/qt5/qttools_5.2.1.bb create mode 100644 recipes-qt/qt5/qttools_git.bb delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.2.0.bb create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.2.1.bb create mode 100644 recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch delete mode 100644 recipes-qt/qt5/qtwebkit/fix-rpath.patch delete mode 100644 recipes-qt/qt5/qtwebkit_5.2.0.bb create mode 100644 recipes-qt/qt5/qtwebkit_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtx11extras_5.2.0.bb create mode 100644 recipes-qt/qt5/qtx11extras_5.2.1.bb delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.2.0.bb create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.2.1.bb diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 3e33af0216..b684a6b8ed 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.2.0", "5.2.0+git%" +# possible values now "5.2.1", "5.2.1+git%" -QT5_VERSION ?= "5.2.0" +QT5_VERSION ?= "5.2.1" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb deleted file mode 100644 index aca8dea09f..0000000000 --- a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" -SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb new file mode 100644 index 0000000000..c106d2278b --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" +SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb deleted file mode 100644 index 0effa1bfa5..0000000000 --- a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" -SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb new file mode 100644 index 0000000000..d186a21350 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" +SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7ca9bf85f8..aaa9c04f1c 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -4,7 +4,7 @@ require ${PN}.inc QT_MODULE_BRANCH = "master" # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already -SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9" +SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad" do_configure_prepend() { # Temporary hack to get qt3d build for Qt 5.1.0 diff --git a/recipes-qt/qt5/qt5-5.2.0.inc b/recipes-qt/qt5/qt5-5.2.1.inc similarity index 100% rename from recipes-qt/qt5/qt5-5.2.0.inc rename to recipes-qt/qt5/qt5-5.2.1.inc diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 97a1c37dbd..fa0c06e6c9 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,5 +1,5 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa +# Copyright (C) 2013-2014 Martin Jansa QT_MODULE_BRANCH ?= "stable" @@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.2.0+git${SRCPV}" +PV = "5.2.1+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" diff --git a/recipes-qt/qt5/qtbase-native_5.2.0.bb b/recipes-qt/qt5/qtbase-native_5.2.1.bb similarity index 63% rename from recipes-qt/qt5/qtbase-native_5.2.0.bb rename to recipes-qt/qt5/qtbase-native_5.2.1.bb index 8ccd16df50..54adc48f66 100644 --- a/recipes-qt/qt5/qtbase-native_5.2.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.2.1.bb @@ -7,5 +7,5 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" -SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" +SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" +SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 471d95b3b9..c69b631a8e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -7,4 +7,4 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" +SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 83ce25b556..f056393890 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -18,7 +18,6 @@ SRC_URI += "\ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ - file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0976c34302..5ce4cdd13d 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001 +From f883ec8652ee603d9bb9def7eb669ed82c493961 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/14] Add linux-oe-g++ platform @@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index a330dd6..1b328ae 100755 +index aaa59bd..0e74f29 100755 --- a/configure +++ b/configure @@ -324,6 +324,16 @@ getQMakeConf() @@ -97,7 +97,7 @@ index a330dd6..1b328ae 100755 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do qmakevarname="${varname}" -@@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then +@@ -3362,7 +3394,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then CFG_QGTKSTYLE=no fi @@ -106,7 +106,7 @@ index a330dd6..1b328ae 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3397,7 +3429,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi @@ -115,7 +115,7 @@ index a330dd6..1b328ae 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3860,6 +3892,14 @@ setBootstrapVariable() +@@ -3878,6 +3910,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -130,7 +130,7 @@ index a330dd6..1b328ae 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3916,11 +3956,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index afc25cc4ba..2f72dca5e0 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001 +From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside @@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 3f7854fda1..7e03f74027 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,4 +1,4 @@ -From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001 +From 3648eeddaed0cf31fba226ec713d2321f398974f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 03/14] Add -external-hostbindir option @@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/configure b/configure -index 1b328ae..46f7230 100755 +index 0e74f29..7f3f2f0 100755 --- a/configure +++ b/configure -@@ -785,6 +785,7 @@ QT_HOST_BINS= +@@ -788,6 +788,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -39,7 +39,7 @@ index 1b328ae..46f7230 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do +@@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -47,7 +47,7 @@ index 1b328ae..46f7230 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do +@@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -57,7 +57,7 @@ index 1b328ae..46f7230 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2226,6 +2231,10 @@ Installation options: +@@ -2236,6 +2241,10 @@ Installation options: -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -68,7 +68,7 @@ index 1b328ae..46f7230 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3133,6 +3142,11 @@ fi +@@ -3151,6 +3160,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -80,7 +80,7 @@ index 1b328ae..46f7230 100755 # update QT_CONFIG to show our current predefined configuration CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in -@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3838,6 +3852,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", @@ -135,7 +135,7 @@ index e50485c..71291ad 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index 7576db7..d51af0e 100644 +index 140a137..4e01d5b 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -70,16 +70,22 @@ CONFIG -= qt @@ -198,7 +198,7 @@ index 17864b5..a14bc0f 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index e2fef2c..ab475c3 100644 +index 5ab413a..50a192b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() @@ -224,5 +224,5 @@ index e2fef2c..ab475c3 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 71a4596978..16317ac7b0 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,4 +1,4 @@ -From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001 +From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with @@ -10,7 +10,7 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index ab475c3..68cd43d 100644 +index 50a192b..46eabe4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri() @@ -25,5 +25,5 @@ index ab475c3..68cd43d 100644 configStream << "}" << endl; if (dictionary["QT_EDITION"].contains("OPENSOURCE")) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch index f85fb33b23..833c9b59e0 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch @@ -1,4 +1,4 @@ -From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001 +From 1f9449f851f7ec288948ec8e83f2fe4b0b37e789 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement @@ -33,13 +33,13 @@ Content-Transfer-Encoding: 8bit * 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 -Upstream-Status: Pending - Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller --- @@ -113,5 +113,5 @@ index 11509ee..2f95684 100644 unix|win32-g++* { -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 82e028d7b2..726bfe003e 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,4 +1,4 @@ -From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001 +From ebd38fc708cf7190e47a75754235f56fa5d86300 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa 1 file changed, 14 deletions(-) diff --git a/configure b/configure -index 46f7230..96c56c8 100755 +index 7f3f2f0..13dd619 100755 --- a/configure +++ b/configure @@ -581,20 +581,6 @@ fi'` @@ -39,5 +39,5 @@ index 46f7230..96c56c8 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch index b2b5ef9c26..e8a7784be3 100644 --- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,4 +1,4 @@ -From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001 +From 828eecd8f361cb965bd40f535435efa91665c8e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make @@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch index eea0c343c2..cccf7fbe1b 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch @@ -1,9 +1,12 @@ -From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001 +From 3923edc900d1b3dd23e0a6af3a32255707cd497c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Feb 2012 15:10:24 +0000 Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a configurable option +Allows disabling pulseaudio, alsa, freetype support at configure time +making builds more deterministic. + Upstream-Status: Pending Signed-off-by: Paul Eggleton @@ -13,10 +16,10 @@ Signed-off-by: Martin Jansa 1 file changed, 21 insertions(+) diff --git a/configure b/configure -index 96c56c8..b3854aa 100755 +index 13dd619..66c2ae0 100755 --- a/configure +++ b/configure -@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do +@@ -1810,6 +1810,27 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -45,5 +48,5 @@ index 96c56c8..b3854aa 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch index b35597b79c..23e22a894a 100644 --- a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch +++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch @@ -1,4 +1,4 @@ -From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001 +From acbd622d1b91c1aa9ec8c48d10d91354d175345c Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to @@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 1e00c74..a99b5bf 100644 +index 9bda70e..6e3605a 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -46,7 +46,7 @@ index 1e00c74..a99b5bf 100644 _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 +index 1d94715..617efa8 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -81,5 +81,5 @@ index e5650ff..16ff007 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 91370f172d..5681b58352 100644 --- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001 +From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH 10/12] Always build uic @@ -34,5 +34,5 @@ index b7887a6..8801544 100644 \ No newline at end of file +QMAKE_EXTRA_TARGETS = sub-tools -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch index 1b1d85e335..64ba88e7af 100644 --- a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch @@ -1,4 +1,4 @@ -From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001 +From 77a18a9fe2d0e4a1dcd95e2d78c85eb37452bc73 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 Subject: [PATCH 10/14] qmake is already built in qtbase-native @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index b3854aa..15c89c7 100755 +index 66c2ae0..ac836aa 100755 --- a/configure +++ b/configure -@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable() +@@ -3941,7 +3941,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index b3854aa..15c89c7 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch index 65b65aa733..f80edbd9f0 100644 --- a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,4 +1,4 @@ -From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001 +From dd14f3eda61669c66c95dbcbca3afbd61f9aa746 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 Subject: [PATCH 11/14] Allow building a separate qmake for the target @@ -26,5 +26,5 @@ index 89d6ea5..7c605b9 100644 VPATH += \ ../src/corelib/global \ -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch index 9335610d0c..798cd45e67 100644 --- a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch @@ -1,4 +1,4 @@ -From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001 +From 441b2ebc41013505b9f5b6a4db43526506f84e47 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:22:34 -0500 Subject: [PATCH 11/12] configure: preserve built qmake and swap with native @@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index b3854aa..20836a6 100755 +index 66c2ae0..d423cce 100755 --- a/configure +++ b/configure -@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake @@ -26,5 +26,5 @@ index b3854aa..20836a6 100755 echo "Running configuration tests..." -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch index d235797d07..be86f71d99 100644 --- a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001 +From 63313ba681ad5bb0ef83c3b8908387939c2b41d5 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:27:30 -0500 Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters @@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 20836a6..50661f4 100755 +index d423cce..1ea4102 100755 --- a/configure +++ b/configure -@@ -3805,7 +3805,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3823,7 +3823,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 */ @@ -25,5 +25,5 @@ index 20836a6..50661f4 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch index 591be8e5fc..9d46d2fb18 100644 --- a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch @@ -1,4 +1,4 @@ -From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001 +From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 Subject: [PATCH 12/14] qtbase: allow build of examples @@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 - } } -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch index 9bef55afde..c6ec67cbf7 100644 --- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch @@ -1,4 +1,4 @@ -From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001 +From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support @@ -150,5 +150,5 @@ index 3b62d1d..a5d1f7e 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch deleted file mode 100644 index 5b5d18f051..0000000000 --- a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/14] enables tslib device to be read from env variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -from : -https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch - -Signed-off-by: Eric Bénard -Signed-off-by: Martin Jansa ---- - src/plugins/generic/tslib/qtslib.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp -index 6986fd5..2ed4a69 100644 ---- a/src/plugins/generic/tslib/qtslib.cpp -+++ b/src/plugins/generic/tslib/qtslib.cpp -@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, - qDebug() << "QTsLibMouseHandler" << key << specification; - setObjectName(QLatin1String("TSLib Mouse Handler")); - -- QByteArray device = "/dev/input/event1"; -+ QByteArray device = qgetenv("TSLIB_TSDEVICE"); -+ if(device.isEmpty()) -+ device = "/dev/input/event1"; - if (specification.startsWith("/dev/")) - device = specification.toLocal8Bit(); - --- -1.8.5.2 - diff --git a/recipes-qt/qt5/qtbase_5.2.0.bb b/recipes-qt/qt5/qtbase_5.2.0.bb deleted file mode 100644 index aca8dea09f..0000000000 --- a/recipes-qt/qt5/qtbase_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" -SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb new file mode 100644 index 0000000000..c106d2278b --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" +SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bd8a6f6953..4d55dbe613 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" +SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" diff --git a/recipes-qt/qt5/qtconnectivity_5.2.1.bb b/recipes-qt/qt5/qtconnectivity_5.2.1.bb new file mode 100644 index 0000000000..6fd0c7bada --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a" +SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 4373e5eae1..cca309b9b4 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${BPN}.inc -SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953" +SRCREV = "2f2985b03f5202a9ab329f89de7317585af8c250" diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 7a68dd53e9..f1393785d6 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch @@ -1,7 +1,7 @@ -From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 +From 6e3f95ab76c4de1333eab1625b507c09ad52d340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sun, 26 May 2013 14:26:19 +0200 -Subject: [PATCH 1/3] qmltestexample: fix link +Subject: [PATCH 1/2] qmltestexample: fix link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,9 +13,8 @@ Upstream-Status: Inappropriate Signed-off-by: Eric Bénard --- - examples/qmltest/qmltest/qmltest.pro | 2 +- - tools/qmltestrunner/qmltestrunner.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + examples/qmltest/qmltest/qmltest.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index b5893c5..1b00e6c 100644 @@ -42,5 +41,5 @@ index 5184c1f..668cf17 100644 load(qt_tool) -- -1.8.3.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch index 84f8f66106..5643634c56 100644 --- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -1,4 +1,4 @@ -From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 +From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20H=C3=A4nel?= Date: Wed, 5 Jun 2013 19:23:32 +0200 Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions @@ -24,10 +24,10 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index a6dabee..290f283 100644 +index d7b9847..a54d282 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp -@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() +@@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout() prepareVisibleItemTransitions(); @@ -37,5 +37,5 @@ index a6dabee..290f283 100644 it != releasePendingTransition.end(); ) { FxViewItem *item = *it; -- -1.8.3.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtdeclarative_5.2.0.bb b/recipes-qt/qt5/qtdeclarative_5.2.0.bb deleted file mode 100644 index a88f50f2e3..0000000000 --- a/recipes-qt/qt5/qtdeclarative_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202" -SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19" diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb new file mode 100644 index 0000000000..8e435cf609 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc" +SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 9190800c73..1b9decd356 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,4 +1,5 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de" +QT_MODULE_BRANCH = "release" +SRCREV = "96e4f00db3bfd222146780251013501cfdd8baaa" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb deleted file mode 100644 index df36dc6a65..0000000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd" -SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb new file mode 100644 index 0000000000..4d5673b991 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c" +SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index c1bd9fad4e..2f964fe6bf 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb" +SRCREV = "740fbcf28012ade59087df945b4c6b8ae05b7a68" diff --git a/recipes-qt/qt5/qtimageformats_5.2.0.bb b/recipes-qt/qt5/qtimageformats_5.2.0.bb deleted file mode 100644 index a12e5d8bcf..0000000000 --- a/recipes-qt/qt5/qtimageformats_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55" -SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210" diff --git a/recipes-qt/qt5/qtimageformats_5.2.1.bb b/recipes-qt/qt5/qtimageformats_5.2.1.bb new file mode 100644 index 0000000000..2d24ce75f9 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f" +SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 856bfba7fd..8a39e2d757 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571" +SRCREV = "8548d1fe0985b3b680acef3135646aa4e876175c" diff --git a/recipes-qt/qt5/qtlocation_5.2.1.bb b/recipes-qt/qt5/qtlocation_5.2.1.bb new file mode 100644 index 0000000000..f920e2c717 --- /dev/null +++ b/recipes-qt/qt5/qtlocation_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840" +SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d5d7e844f8..e1af5fb760 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382" +SRCREV = "a74b31c16b4baeeb8047e1958eb1b6787dc885e8" diff --git a/recipes-qt/qt5/qtmultimedia_5.2.0.bb b/recipes-qt/qt5/qtmultimedia_5.2.0.bb deleted file mode 100644 index 9f3f5b1a6d..0000000000 --- a/recipes-qt/qt5/qtmultimedia_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365" -SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac" diff --git a/recipes-qt/qt5/qtmultimedia_5.2.1.bb b/recipes-qt/qt5/qtmultimedia_5.2.1.bb new file mode 100644 index 0000000000..fc823a6d12 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a" +SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 8ba720f1bb..6e87fb37f2 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "ea9f9788d502d4a4307a464d87a00be198df09ad" +SRCREV = "658ad524f8ba9cbcae797aefbdf498ef9d364067" diff --git a/recipes-qt/qt5/qtquick1_5.2.0.bb b/recipes-qt/qt5/qtquick1_5.2.0.bb deleted file mode 100644 index bc3df43ff5..0000000000 --- a/recipes-qt/qt5/qtquick1_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "4535ff78b5a9a18ffba702298a48e22e" -SRC_URI[sha256sum] = "ae868892a586cd0622a558fda6ebada8edadb575edf3b50e5569fd7115b6e805" diff --git a/recipes-qt/qt5/qtquick1_5.2.1.bb b/recipes-qt/qt5/qtquick1_5.2.1.bb new file mode 100644 index 0000000000..7563bc6be1 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921" +SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 1a83f10821..636c4c91fc 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "2866c00375313d1726cc0473b6b7bfc87b984c78" +SRCREV = "3384daf6d1ab1fc15908866e2743f060a7461daa" diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb deleted file mode 100644 index 99c5bc0cf4..0000000000 --- a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "748ab947f59fb104db2ac1fefa073d81" -SRC_URI[sha256sum] = "c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c" - diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb new file mode 100644 index 0000000000..2c09e440f1 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac" +SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac" + diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 76f96ea42f..be0fbba022 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "1d684b38a4fb0b8ce33401fa9c8f415eba6097bf" +SRCREV = "c7540702126251ca5f7cc78e685b970d06e48ce8" diff --git a/recipes-qt/qt5/qtscript_5.2.0.bb b/recipes-qt/qt5/qtscript_5.2.0.bb deleted file mode 100644 index c477d9ecbf..0000000000 --- a/recipes-qt/qt5/qtscript_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "37d32c983c3fdf5b29f932265046f2e3" -SRC_URI[sha256sum] = "ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294" diff --git a/recipes-qt/qt5/qtscript_5.2.1.bb b/recipes-qt/qt5/qtscript_5.2.1.bb new file mode 100644 index 0000000000..4617c09e73 --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9" +SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index fd98b67279..dd9b3a81be 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "15bb30b0e90c628cc3812627923d1d459d461505" +SRCREV = "3aadb5c9894d5fe92923cc6c5dd2a71949a49927" diff --git a/recipes-qt/qt5/qtsensors_5.2.0.bb b/recipes-qt/qt5/qtsensors_5.2.0.bb deleted file mode 100644 index 7eabd189b3..0000000000 --- a/recipes-qt/qt5/qtsensors_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "718606a6f76afa20c6cd2e0433356ac2" -SRC_URI[sha256sum] = "5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446" diff --git a/recipes-qt/qt5/qtsensors_5.2.1.bb b/recipes-qt/qt5/qtsensors_5.2.1.bb new file mode 100644 index 0000000000..1f340d0de1 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841" +SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index db5f81698d..767655f9bc 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "8b501195f623fbcf31b591a1414e1726dbb7ce84" +SRCREV = "832136829ece18885ef7ac35f4527d1d314aaea8" diff --git a/recipes-qt/qt5/qtserialport_5.2.0.bb b/recipes-qt/qt5/qtserialport_5.2.0.bb deleted file mode 100644 index 03dae6c019..0000000000 --- a/recipes-qt/qt5/qtserialport_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7b90e0707b698331226e662bd39945e9" -SRC_URI[sha256sum] = "c7d5bb58d6c574275102d088159d0323aac40a639ceb4224aa06c34d2fe8d292" diff --git a/recipes-qt/qt5/qtserialport_5.2.1.bb b/recipes-qt/qt5/qtserialport_5.2.1.bb new file mode 100644 index 0000000000..806e7eee8e --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251" +SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index af2cf22bd3..028c77fa77 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -1,4 +1,5 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "97bbe2acd8b4c14315653a3d9dc5757d6518220e" +QT_MODULE_BRANCH = "release" +SRCREV = "29e526ad5c1e2fe0996ba0a776d83ec86f7197d7" diff --git a/recipes-qt/qt5/qtsvg_5.2.0.bb b/recipes-qt/qt5/qtsvg_5.2.0.bb deleted file mode 100644 index e300b4c810..0000000000 --- a/recipes-qt/qt5/qtsvg_5.2.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "3f6132475f6edcd7b6cfb57650846185" -SRC_URI[sha256sum] = "bad23ebcebf8e91cc727b229a3f87f95829edfd2a7653d47e97b154aac687c59" - diff --git a/recipes-qt/qt5/qtsvg_5.2.1.bb b/recipes-qt/qt5/qtsvg_5.2.1.bb new file mode 100644 index 0000000000..d12bd83890 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.2.1.bb @@ -0,0 +1,6 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d" +SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef" + diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index a727e8339e..986b0c103b 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "b719b93770393bbf20251e1dffc70498061e612c" +SRCREV = "ef1c298cc27e15dd6f6bba95b605471d95bead6b" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 80c9309de4..7853355308 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,9 +1,9 @@ require qt5-git.inc require ${PN}.inc -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 +# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 +# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 QT_MODULE_BRANCH = "dev" -SRCREV = "d6104a92321c2e72b140156fddf0378c9795cdb4" +SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102" diff --git a/recipes-qt/qt5/qttools-native_5.2.0.bb b/recipes-qt/qt5/qttools-native_5.2.0.bb deleted file mode 100644 index 0effa1bfa5..0000000000 --- a/recipes-qt/qt5/qttools-native_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" -SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" diff --git a/recipes-qt/qt5/qttools-native_5.2.1.bb b/recipes-qt/qt5/qttools-native_5.2.1.bb new file mode 100644 index 0000000000..d186a21350 --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" +SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 72006ed868..77c5a8d6ec 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a60aa90f5ca00e32a1271a476f5da650dddebfda" +SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index ec82bb94fc..49f296d811 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,7 +1,7 @@ -From a4af5dd2b0449df19271b22a62a03f70598106f0 Mon Sep 17 00:00:00 2001 +From a5150c9701d5b2e6c77e521544034ea732d2266b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert +Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native is built without GUI support (no-png is set) and we still want to build @@ -134,5 +134,5 @@ index eaf440b..1778ad1 100644 installed_cmake.depends = cmake -- -1.8.4.3 +1.8.5.3 diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index 0f9533389f..3e4cf4ef71 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch @@ -1,7 +1,7 @@ -From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001 +From 6837c212d388a3b679b7420c5f1c98ef85d04a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jan 2014 14:33:19 +0100 -Subject: [PATCH] assistant/help: fix linking of dependent libraries +Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,5 +28,5 @@ index ed75c37..a2c55c7 100644 + +LIBS += -lQt5CLucene -- -1.8.3.1 +1.8.5.3 diff --git a/recipes-qt/qt5/qttools_5.2.0.bb b/recipes-qt/qt5/qttools_5.2.0.bb deleted file mode 100644 index 0effa1bfa5..0000000000 --- a/recipes-qt/qt5/qttools_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" -SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" diff --git a/recipes-qt/qt5/qttools_5.2.1.bb b/recipes-qt/qt5/qttools_5.2.1.bb new file mode 100644 index 0000000000..d186a21350 --- /dev/null +++ b/recipes-qt/qt5/qttools_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" +SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb new file mode 100644 index 0000000000..77c5a8d6ec --- /dev/null +++ b/recipes-qt/qt5/qttools_git.bb @@ -0,0 +1,4 @@ +require qt5-git.inc +require ${PN}.inc + +SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc index 4aa82c361a..78416e894d 100644 --- a/recipes-qt/qt5/qtwayland-native.inc +++ b/recipes-qt/qt5/qtwayland-native.inc @@ -1,10 +1,5 @@ require qt5-native.inc -LICENSE = "BSD & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ - file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ -" - QT_MODULE = "${BPN}" DEPENDS = "qtbase-native wayland-native" diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 2ffaff6144..988aa98b2e 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -2,7 +2,6 @@ require qt5-git.inc require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# this PV is only to indicate that this recipe is compatible with qt5 5.2.0 -PV = "5.2.0+git${SRCPV}" +# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 -SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" +SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index eec26b673a..29c6b276fc 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -1,10 +1,5 @@ require qt5.inc -LICENSE = "BSD & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ - file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ -" - # wayland-native is already in wayland DEPENDS, but add it here # explicitly, because it's native wayland-scanner we're looking for # libxkbcommon isn't mandatory make it easier to remove by .bbappend diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 640373e031..988aa98b2e 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -2,6 +2,6 @@ require qt5-git.inc require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 +# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 -SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" +SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb deleted file mode 100644 index 934873634e..0000000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "8431a8476213b3a3587e04b023a2435f" -SRC_URI[sha256sum] = "80e7eb55ea6c4a4e92f44eb1d3cd7c9ecd85f9d5e48e682a31473633fa46a64e" diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb new file mode 100644 index 0000000000..c16f91cdd4 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3" +SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 582833e1ac..0cc5fbfe73 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "634cddbfef6a40b991bcdf8e68e5329747f43c57" +SRCREV = "0d6e9989eb2a15d130b2a132ddc196835a33c9b6" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index f2b678ea8c..aea9dad089 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -14,7 +14,7 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " -SRC_URI += "file://fix-rpath.patch" +SRC_URI += "file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch" # make sure rb files are used from sysroot, not from host # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch new file mode 100644 index 0000000000..07e4436ede --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -0,0 +1,31 @@ +From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001 +From: Trevor Woerner +Date: Fri, 7 Feb 2014 04:07:17 +0100 +Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) + +Building qtwebkit causes a QA issue such that QtWebPluginProcess and +QtWebProcess contain bad RPATHs which point into the build location. This fix +adds a patch to not include the rpath.prf which causes this problem. + +Signed-off-by: Trevor Woerner +Signed-off-by: Martin Jansa +--- + Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf +index 79b7208..6dff72b 100644 +--- a/Tools/qmake/mkspecs/features/unix/default_post.prf ++++ b/Tools/qmake/mkspecs/features/unix/default_post.prf +@@ -58,8 +58,6 @@ linux-*g++* { + QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions + } + +-contains(TEMPLATE, app): CONFIG += rpath +- + CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { + # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. + !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory +-- +1.8.5.3 + diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch deleted file mode 100644 index 5c20514417..0000000000 --- a/recipes-qt/qt5/qtwebkit/fix-rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf -=================================================================== ---- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -32,8 +32,6 @@ linux-*g++* { - QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions - } - --contains(TEMPLATE, app): CONFIG += rpath -- - isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. - config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory diff --git a/recipes-qt/qt5/qtwebkit_5.2.0.bb b/recipes-qt/qt5/qtwebkit_5.2.0.bb deleted file mode 100644 index 1e16a89ab7..0000000000 --- a/recipes-qt/qt5/qtwebkit_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1378e18aecd8cc223deb729c8f0a735d" -SRC_URI[sha256sum] = "390e16e719e41bcc94fd79866a0909b70235513778063c5e47227b8b9876e0cf" diff --git a/recipes-qt/qt5/qtwebkit_5.2.1.bb b/recipes-qt/qt5/qtwebkit_5.2.1.bb new file mode 100644 index 0000000000..ef166f2228 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63" +SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index af8598a672..8ba7145c9f 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "4c86230bfe563ef1e3ef493b870203761bc9f32d" +SRCREV = "3dd07419f3f627ffd0a9efc3f7253cef145f14e5" diff --git a/recipes-qt/qt5/qtx11extras_5.2.0.bb b/recipes-qt/qt5/qtx11extras_5.2.0.bb deleted file mode 100644 index 75ba58cdf1..0000000000 --- a/recipes-qt/qt5/qtx11extras_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1a11c4bb67503e2a5ef10b96bbe11b61" -SRC_URI[sha256sum] = "98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4" diff --git a/recipes-qt/qt5/qtx11extras_5.2.1.bb b/recipes-qt/qt5/qtx11extras_5.2.1.bb new file mode 100644 index 0000000000..b619a4d588 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a" +SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ec4054ebb6..d6f82c0c36 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "120c2267e1960c03a22531c2d5bfe1d87d401ad9" +SRCREV = "766eaface63b98a248d49d6b70f367e9eebb8f95" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb deleted file mode 100644 index dede57b7f9..0000000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7c3e94cd04603c3f81e50d47daf5bbc7" -SRC_URI[sha256sum] = "a8192ee70d8d3e9944a8d8f03521e3abf6beb7f6de1bf2d80871dfc4d9bd2a2a" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb new file mode 100644 index 0000000000..ab5570c092 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb @@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18" +SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8d3574607b..a51e6c1a01 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "97f266a006d82cc8554915cba6bf767b93d71a06" +SRCREV = "f73a75f92a2e6036bbc183d7f63bfd8f42e8abc6" From 47ec6dbcba57b0b0f7dbeb00bef24f8d85112947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 10 Feb 2014 21:45:00 +0100 Subject: [PATCH 306/347] qtwayland.inc: fix QA warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WARNING: QA Issue: qtwayland: Files/directories were installed but not shipped /usr/lib/qt5/plugins/wayland-graphics-integration /usr/lib/qt5/plugins/wayland-graphics-integration/client /usr/lib/qt5/plugins/wayland-graphics-integration/server /usr/lib/qt5/plugins/wayland-graphics-integration/client/libwayland-egl.so /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug/libwayland-egl.so /usr/lib/qt5/plugins/wayland-graphics-integration/server/libwayland-egl.so /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug/libwayland-egl.so Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 29c6b276fc..abeb15f346 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc @@ -14,3 +14,11 @@ QT_WAYLAND_BUILD_PARTS ?= "examples" EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}" EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}" EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=${QT_WAYLAND_BUILD_PARTS}" + +FILES_${PN}-plugins += " \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ +" + +FILES_${PN}-plugins-dbg += " \ + ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ +" From 52e39c35ee227a9eb1b1a182f9a873c4e7e55825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 5 Feb 2014 20:35:11 +0100 Subject: [PATCH 307/347] qtbase: 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 Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 + ...ror-for-platforms-only-supporting-on.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f056393890..d61d2dbf35 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -18,6 +18,7 @@ SRC_URI += "\ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ + file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch new file mode 100644 index 0000000000..6fd29381d8 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch @@ -0,0 +1,63 @@ +From c8995c6eb6cf4bfa8daf1e3e96bd4885a096f405 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 14/14] 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 +--- + src/plugins/platforms/eglfs/qeglfswindow.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp +index bba00da..567820c 100644 +--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp ++++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp +@@ -87,6 +87,16 @@ void QEglFSWindow::create() + if (m_flags.testFlag(Created)) + return; + ++ 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; ++ } ++ + m_flags = Created; + m_wid = newWId(); + +@@ -130,6 +140,11 @@ void QEglFSWindow::create() + + resetSurface(); + ++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows)) ++ { ++ __singleWindowSurface = m_surface; ++ } ++ + screen->setPrimarySurface(m_surface); + + if (m_flags.testFlag(IsRaster)) { +-- +1.8.5.3 + From dc0073bb4586077ec1cc5204cca9029c656997b4 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Sat, 18 Jan 2014 12:09:20 +0100 Subject: [PATCH 308/347] libQt5*.la references OE build directories I'm trying to get the .la-files for Qt5 dev-packages correct. What I've come up with so far is attached in the patch (to be applied in top of "jansa-qt5-5.2.0", b8a236df79c25802c1f2eb2525e8a534e73e608e) With the patch applied I can still build both an image and an SDK, and also the resulting SDK can be used to build my QT5 autotools projects. But I get these warnings when building for instance "qtxmlpatterns": WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host include and/or library paths were used. Signed-off-by: Jacob Kroon Signed-off-by: Martin Jansa --- ...-qt_module-Fix-pkgconfig-replacement.patch | 56 +++++++------------ 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch index 833c9b59e0..b8768c89c8 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch @@ -1,4 +1,4 @@ -From 1f9449f851f7ec288948ec8e83f2fe4b0b37e789 Mon Sep 17 00:00:00 2001 +From 7999eeb3f2ab1150aa301ec26ae9bf0788d09c9e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement @@ -43,60 +43,42 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller --- - mkspecs/features/qt_module.prf | 43 ++++++++++++++++++++++++++++++------------ - 1 file changed, 31 insertions(+), 12 deletions(-) + mkspecs/features/qt_module.prf | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 11509ee..2f95684 100644 +index 11509ee..be9b929 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -135,30 +135,49 @@ load(qt_installs) +@@ -135,30 +135,36 @@ load(qt_installs) rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR -include_replace.match = $$rplbase/include -include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -include_replace.CONFIG = path --lib_replace.match = $$rplbase/lib --host_build: \ -- lib_replace.replace = $$[QT_HOST_LIBS] --else: \ +pkgconfig_include_replace.match = $$rplbase/include +pkgconfig_include_replace.replace = "\$$\\{includedir}" ++pkgconfig_include_replace.CONFIG = path +pkgconfig_lib_replace.match = $$rplbase/lib +pkgconfig_lib_replace.replace = "\$$\\{libdir}" -+!exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ include_replace.CONFIG = path -+ lib_replace.match = $$rplbase/lib ++pkgconfig_lib_replace.CONFIG = path + lib_replace.match = $$rplbase/lib + host_build: \ + lib_replace.replace = $$[QT_HOST_LIBS] + else: \ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] --lib_replace.CONFIG = path -+ lib_replace.CONFIG = path -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+} else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ include_replace.CONFIG = path -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.CONFIG = path -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+} - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + lib_replace.CONFIG = path +-QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace ++lafile_replace.match = "-L$$[QT_INSTALL_LIBS/raw]" ++lafile_replace.replace = "" ++lafile_replace.CONFIG = path ++QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace unix|win32-g++* { CONFIG += create_pc -- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace + QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace - QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace -+ host_build: \ -+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] -+ else: \ -+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME QMAKE_PKGCONFIG_DESTDIR = pkgconfig @@ -108,7 +90,7 @@ index 11509ee..2f95684 100644 CONFIG += create_libtool explicitlib QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace } unix|win32-g++* { From 0d9f550f68f27ebbdf8856693b1078bbb3049849 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 18 Feb 2014 00:01:28 -0800 Subject: [PATCH 309/347] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer seems to be required. Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon. Signed-off-by: Andre McCurdy Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index d61d2dbf35..4c1c6ddaf0 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -127,9 +127,6 @@ QT_CONFIG_FLAGS += " \ ${EXTRA_OECONF} \ " -# Qt uses atomic instructions not supported in thumb mode -ARM_INSTRUCTION_SET = "arm" - do_generate_qt_config_file_append() { cat >> ${QT_CONF_PATH} < Date: Tue, 18 Feb 2014 11:26:05 +0100 Subject: [PATCH 310/347] qtbase: add PACKAGECONFIG for mtdev Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 4c1c6ddaf0..116c86f73f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -101,6 +101,7 @@ PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" +PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" From 4375b28f7c70b033ee416df153498e9f76396025 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Feb 2014 16:36:44 +0100 Subject: [PATCH 311/347] qtbase-native: explicitly disable icu * Jonathan Liu reported that qtbase-native was failing to build for him and it looks like qtbase-native was trying to link against icu from his host (instead of icu-native because it isn't in DEPENDS) Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index b9193e4ea2..860bc290dc 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -51,6 +51,7 @@ EXTRA_OECONF = " \ -no-opengl \ -no-openssl \ -no-xcb \ + -no-icu \ -verbose \ -release \ -prefix ${OE_QMAKE_PATH_PREFIX} \ From 5599656cda1728b7262a9ae7154759dcd40a874e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 20 Feb 2014 12:12:11 -0500 Subject: [PATCH 312/347] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B} * This way we don't mangle ${B} and can repeat do_install if necessary. And previously it would require running do_compile again to restore the proper state of ${B}. * Need to bump PR, since do_compile isn't changing, but needs to re-run to re-populate qmake-real binary. Signed-off-by: Denys Dmytriyenko Signed-off-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index fa4400947d..3cb9b0eea6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -10,6 +10,8 @@ require nativesdk-qt5.inc # it's already included with newer oe-core, but include it here for dylan FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" +PR = "r1" + # common with -native and target version SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ @@ -192,14 +194,12 @@ do_install() { # Fix install paths for all find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" - # switch back the proper qmake - if [ -e ${B}/bin/qmake-real ]; then - rm ${B}/bin/qmake - mv ${B}/bin/qmake-real ${B}/bin/qmake - fi - oe_runmake install INSTALL_ROOT=${D} + # replace the native qmake installed above with nativesdk version + rm -rf ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake + install -m 755 ${B}/bin/qmake-real ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake + # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) # e.g. qt3d, qtwayland ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt From 5d4479d19ddccbab0efec2c85b646b35a2f7c2bc Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Fri, 21 Feb 2014 14:49:56 -0800 Subject: [PATCH 313/347] qtbase: Make it easier to change [release|debug] PACKAGECONFIG Also add -developer-build to PACKAGECONFIG Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 116c86f73f..b4587af471 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -40,9 +40,11 @@ PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" +# Either release or debug, can be overridden in bbappends +PACKAGECONFIG_RELEASE ?= "release" PACKAGECONFIG ??= " \ - release \ + ${PACKAGECONFIG_RELEASE} \ dbus \ udev \ evdev \ @@ -58,6 +60,7 @@ PACKAGECONFIG ??= " \ " PACKAGECONFIG[release] = "-release,-debug" +PACKAGECONFIG[developer] = "-developer-build" PACKAGECONFIG[sm] = "-sm,-no-sm" PACKAGECONFIG[tests] = ",-nomake tests" PACKAGECONFIG[examples] = ",-nomake examples" From b7b624386cb736b0f9ff5529e92059fb97d9787d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 21 Feb 2014 21:30:06 -0800 Subject: [PATCH 314/347] qtbase: configure with -openssl-linked instead of -openssl Configure qtbase with -openssl-linked (instead of -openssl) to ensure that run-time dependencies on libcryto and libssl are detected. Signed-off-by: Andre McCurdy Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index b4587af471..5237906a99 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -115,7 +115,8 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,kms" # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl" +# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected +PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" From e6f2641311118bc2169a9a43f2ff2d21a18f4572 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 21 Feb 2014 21:30:07 -0800 Subject: [PATCH 315/347] qtwebkit-examples: add RDEPENDS for ca-certificates If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates. Signed-off-by: Andre McCurdy Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 4 +++- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 7e739c5495..e2a1662121 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -7,6 +7,8 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" +PACKAGECONFIG_OPENSSL ?= "openssl" + QT_MODULE ?= "${BPN}" # we don't want conflicts with qt4 diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5237906a99..d8ad4da5f1 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -42,6 +42,8 @@ PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', ' PACKAGECONFIG_DISTRO ?= "" # Either release or debug, can be overridden in bbappends PACKAGECONFIG_RELEASE ?= "release" +# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency +# PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG ??= " \ ${PACKAGECONFIG_RELEASE} \ @@ -49,7 +51,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \ diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc index 50c28cdb7a..84f16a4e51 100644 --- a/recipes-qt/qt5/qtwebkit-examples.inc +++ b/recipes-qt/qt5/qtwebkit-examples.inc @@ -10,3 +10,4 @@ SRC_URI += " \ DEPENDS += "qtwebkit" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" From 04013e13b1368d86dfa6567807a3345b1de1dc6b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 09:14:12 +0100 Subject: [PATCH 316/347] qtbase: Move remaining few by default enabled options to PACKAGECONFIG_DEFAULT * more and more people don't want to redefine whole PACKAGECONFIG variable Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index d8ad4da5f1..6c477304b3 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -44,13 +44,11 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" -PACKAGECONFIG ??= " \ +PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ - dbus \ - udev \ - evdev \ - widgets \ + ${PACKAGECONFIG_DEFAULT} \ ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ From 6ec88245642cfe16bdd21abdbb8f3fabe13c96b9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 14:18:06 +0100 Subject: [PATCH 317/347] qtbase: Fix PACKAGECONFIG[tests] * at least in 5.2.1 tests aren't enabled by default: QT_ALL_BUILD_PARTS=" libs tools examples tests " QT_DEFAULT_BUILD_PARTS="libs tools examples" so without -make option they weren't enabled even with tests in PACKAGECONFIG * add options for other build parts just for completeness Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 6c477304b3..378f229b40 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -44,7 +44,7 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ @@ -62,8 +62,11 @@ PACKAGECONFIG ?= " \ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[developer] = "-developer-build" PACKAGECONFIG[sm] = "-sm,-no-sm" -PACKAGECONFIG[tests] = ",-nomake tests" -PACKAGECONFIG[examples] = ",-nomake examples" +PACKAGECONFIG[tests] = "-make tests,-nomake tests" +PACKAGECONFIG[examples] = "-make examples,-nomake examples" +PACKAGECONFIG[tools] = "-make tools,-nomake tools" +# only for completeness, configure will add libs even if you try to explicitly remove it +PACKAGECONFIG[libs] = "-make libs,-nomake libs" # accessibility is required to compile qtquickcontrols PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" From 1279a21d9db9c497efbdaef7bb45f313a06df44b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 17:26:42 +0100 Subject: [PATCH 318/347] qtdeclarative: Fix build with tests enabled Signed-off-by: Martin Jansa --- .../0001-qmltestexample-fix-link.patch | 53 +++++++++++++++++-- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index f1393785d6..05aa36426a 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch @@ -1,4 +1,4 @@ -From 6e3f95ab76c4de1333eab1625b507c09ad52d340 Mon Sep 17 00:00:00 2001 +From 64ca7961376fa896d82c2a3db2d42cbb6b68c069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH 1/2] qmltestexample: fix link @@ -11,10 +11,16 @@ ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found Upstream-Status: Inappropriate +Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450 Signed-off-by: Eric Bénard +Signed-off-by: Martin Jansa --- - examples/qmltest/qmltest/qmltest.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + examples/qmltest/qmltest/qmltest.pro | 2 +- + tests/auto/qml/qjsengine/qjsengine.pro | 2 +- + tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- + tests/auto/qmltest/qmltest.pro | 1 + + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index b5893c5..1b00e6c 100644 @@ -29,15 +35,52 @@ index b5893c5..1b00e6c 100644 macx: CONFIG -= app_bundle +diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro +index a62eb75..73b6917 100644 +--- a/tests/auto/qml/qjsengine/qjsengine.pro ++++ b/tests/auto/qml/qjsengine/qjsengine.pro +@@ -1,7 +1,7 @@ + CONFIG += testcase + CONFIG += parallel_test + TARGET = tst_qjsengine +-QT += qml qml-private widgets testlib gui-private ++QT += qml qml-private widgets testlib gui-private quick + macx:CONFIG -= app_bundle + SOURCES += tst_qjsengine.cpp + +diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro +index c6d442e..3181dcd 100644 +--- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro ++++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro +@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle + + TESTDATA = data/* + +-QT += core-private qml-private testlib gui gui-private ++QT += core-private qml-private testlib gui gui-private quick + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro +index 7662cb1..a8f8ae2 100644 +--- a/tests/auto/qmltest/qmltest.pro ++++ b/tests/auto/qmltest/qmltest.pro +@@ -4,6 +4,7 @@ CONFIG += qmltestcase + CONFIG += console + SOURCES += tst_qmltest.cpp + ++QT += quick + + importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests + diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro -index 5184c1f..668cf17 100644 +index 1bb913e..56f2dd5 100644 --- a/tools/qmltestrunner/qmltestrunner.pro +++ b/tools/qmltestrunner/qmltestrunner.pro -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ SOURCES += main.cpp -QT += qml qmltest +QT += qml qmltest quick + CONFIG += no_import_scan load(qt_tool) -- From d8b22f3d4ad6e15ab666b714fa0911a1bc289434 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 17:27:23 +0100 Subject: [PATCH 319/347] qtwayland: Fix xcomposite-glx and examples build * egl was building fine, but glx was failing to find qwaylandintegration.h * one example cannot be built without gles2, so make it conditional Signed-off-by: Martin Jansa --- ...lude-server-buffer-only-when-buildin.patch | 31 +++++++ ...xcomposite-glx-Fix-build-on-Qt-5.2.1.patch | 91 +++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 7 +- 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch create mode 100644 recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch diff --git a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch new file mode 100644 index 0000000000..998f8b6786 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch @@ -0,0 +1,31 @@ +From 201b36614907584a0d446975bddbb11a495540ed Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 22 Feb 2014 17:47:44 +0100 +Subject: [PATCH] examples.pro: include server-buffer only when building with + opengles2 + +* it's using glBindBuffer in + server-buffer/client/serverbufferrenderer.cpp + +Signed-off-by: Martin Jansa +Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +--- + examples/examples.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 2d4cd1b..fb2497e 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -13,5 +13,7 @@ contains(CONFIG, wayland-compositor) { + SUBDIRS += qml-compositor + } + +- SUBDIRS += server-buffer ++ contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++ } + } +-- +1.8.5.3 + diff --git a/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch b/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch new file mode 100644 index 0000000000..2266f4cb07 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch @@ -0,0 +1,91 @@ +From c5c23a37b230b426ed1eeea66544af438f48d05d Mon Sep 17 00:00:00 2001 +From: Taeyeon Mori +Date: Sun, 9 Feb 2014 23:43:06 +0100 +Subject: [PATCH] xcomposite-glx: Fix build on Qt 5.2.1 + +* it was made private in + commit b6713ec4262c05f7d103bc3b75ab81aedc690853 + Author: Jorgen Lind + Date: Wed Dec 18 07:59:53 2013 +0100 + + Make classes in client private + + and qwayland-xcomposite-glx wasn't adapted to it + +* found in + http;//oro.sodimm.me/~hinata/devel/.../0001-Fix-build-on-Qt-5.2.1.patch.htm + but because it was already gone, here is the cache: + http://webcache.googleusercontent.com/search?q=cache:5L0rSgqrKMoJ:oro.sodimm.me/~hinata/devel/qt5-wayland-git/0001-Fix-build-on-Qt-5.2.1.patch.htm&hl=en&gl=cz&strip=1 + +Change-Id: I8eed3645ccacc43e2c9febba2bc6544c7068207a +Signed-off-by: Martin Jansa +--- + .../compositor/xcomposite-glx/xcompositeglxintegration.cpp | 2 +- + src/plugins/platforms/qwayland-xcomposite-glx/main.cpp | 2 +- + .../qwaylandxcompositeglxplatformintegration.h | 14 ++++++++------ + 3 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +index dce1fdc..8403c78 100644 +--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ++++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +@@ -112,7 +112,7 @@ void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display + delete glContext; + } + +-void XCompositeGLXClientBufferIntegration::updateTextureFromBuffer(struct ::wl_resource *buffer) ++void XCompositeGLXClientBufferIntegration::bindTextureToBuffer(struct ::wl_resource *buffer) + { + XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer); + Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window()); +diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +index 17b20f9..c9450a5 100644 +--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp ++++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +@@ -40,7 +40,7 @@ + ****************************************************************************/ + + #include +-#include "qwaylandintegration.h" ++#include "qwaylandxcompositeglxplatformintegration.h" + + QT_BEGIN_NAMESPACE + +diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +index fe8c5b7..fb63fea 100644 +--- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h ++++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +@@ -42,7 +42,7 @@ + #ifndef QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H + #define QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H + +-#include ++#include + + #include "qwaylandxcompositeglxintegration.h" + +@@ -51,14 +51,16 @@ class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration + public: + QWaylandXCompositeGlxPlatformIntegration() + : QWaylandIntegration() +- , m_gl_integration(new QWaylandXCompositeGLXIntegration(display())) +- { } ++ , m_client_buffer_integration(new QWaylandXCompositeGLXIntegration()) ++ { ++ m_client_buffer_integration->initialize(display()); ++ } + +- QWaylandGLIntegration *glIntegration() const Q_DECL_OVERRIDE +- { return m_gl_integration; } ++ QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE ++ { return m_client_buffer_integration; } + + private: +- QWaylandGLIntegration *m_gl_integration; ++ QWaylandClientBufferIntegration *m_client_buffer_integration; + }; + + #endif +-- +1.8.5.3 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 988aa98b2e..789a882c17 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -4,4 +4,9 @@ require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 -SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" +SRCREV = "573d0ee5ba86d99095f217ea9e19172bfc5e75fd" + +SRC_URI += " \ + file://0001-xcomposite-glx-Fix-build-on-Qt-5.2.1.patch \ + file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \ +" From 2bd5fba34dd350807ac07828cd883d5b6c7ec631 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Feb 2014 14:03:49 -0300 Subject: [PATCH 320/347] qmake5_paths.bbclass: Use Qt version path for headers When looking for Qt5 headers we ought to use the Qt5 specific path. In case the distribution wants to have a flat tree it can set QT_DIR_NAME and it will still works as expected. Signed-off-by: Otavio Salvador --- classes/qmake5_paths.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 2b5bf4b663..8f91e93823 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -5,7 +5,7 @@ QT_DIR_NAME ?= "qt5" OE_QMAKE_PATH_PREFIX = "${prefix}" -OE_QMAKE_PATH_HEADERS = "${includedir}" +OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_LIBS = "${libdir}" OE_QMAKE_PATH_ARCHDATA = "${libdir}" OE_QMAKE_PATH_DATA = "${datadir}" From 8222990922ac75f805f649499a2be803da6b6a3b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 20 Feb 2014 14:21:23 -0300 Subject: [PATCH 321/347] mallit-framework-qt5: Don't set OE_QMAKE_PATH_HEADERS The qmake class now respects the QT_DIR_NAME setting when setting the headers path, so this change is not needed anymore. Signed-off-by: Otavio Salvador --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index b6d8cb34d9..633bf6e427 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -6,12 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad" inherit qmake5 -# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir} -# but -# actually it is ${includedir}/qt5 -OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" - - SRC_URI = "git://github.com/maliit/framework.git;branch=master \ file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ file://maliit-server.desktop \ From 9b4dc4d2cf9de6e037df70684d7f6cfee7e4905b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 20 Feb 2014 14:22:32 -0300 Subject: [PATCH 322/347] mallit-plugins-qt5: Don't set OE_QMAKE_PATH_HEADERS The qmake class now respects the QT_DIR_NAME setting when setting the headers path, so this change is not needed anymore. Signed-off-by: Otavio Salvador --- recipes-qt/maliit/maliit-plugins-qt5_git.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 273b3e4c90..7dc1a7304b 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -6,11 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621" inherit qmake5 -# Set path of qt5 headers as qmake5_base.bbclass sets this to just ${includedir} -# but -# actually it is ${includedir}/qt5 -OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" - DEPENDS = "maliit-framework-qt5" RDEPENDS_${PN} += "qtsvg-plugins" From 0d20b53eb8b4c8d09ee8281efbd045aa1561b08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giulian=20Gon=C3=A7alves=20Vivan?= Date: Tue, 18 Feb 2014 17:44:55 -0300 Subject: [PATCH 323/347] qsiv: add the qsiv 1.1 example app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This provides a simple image viewer for demonstration purposes. Signed-off-by: Giulian Gonçalves Vivan --- recipes-qt/qsiv/qsiv_1.1.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes-qt/qsiv/qsiv_1.1.bb diff --git a/recipes-qt/qsiv/qsiv_1.1.bb b/recipes-qt/qsiv/qsiv_1.1.bb new file mode 100644 index 0000000000..bb2efa69a9 --- /dev/null +++ b/recipes-qt/qsiv/qsiv_1.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Qt Simple Image Viewer" +DESCRIPTION = "A simple image viewer using a mix of C++ and qml code for demonstration." +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=11c7965a9059e287de5d93b98adf6d1a" +DEPENDS = "qtdeclarative" + +SRCREV = "7b9810b0f02f9ac74fae3ead6e2e9fb5c1382173" +SRC_URI = "git://code.ossystems.com.br/qt/qsiv;protocol=http" + +S = "${WORKDIR}/git" + +inherit qmake5 + +EXTRA_QMAKEVARS_PRE += "target.path=${libdir}/${P}" + +do_install_append() { + install -d ${D}${bindir} + echo "#!/bin/sh" > ${D}${bindir}/qsiv + echo "export QML_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv + echo "export QML2_IMPORT_PATH=${libdir}/${P}/qml/qsiv" >> ${D}${bindir}/qsiv + echo "${libdir}/${P}/qsiv \$* " >> ${D}${bindir}/qsiv + chmod +x ${D}${bindir}/qsiv +} + +FILES_${PN} += "${libdir}/${P}" +RDEPENDS_${PN} += "qtdeclarative-qmlplugins" + +FILES_${PN}-dbg += "${libdir}/${P}/.debug" From e55d3ef36a98574e7d4535bb03b56c9a05e6578a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 24 Feb 2014 12:39:34 -0300 Subject: [PATCH 324/347] populate_sdk_qt5.bbclass: Fix symlink location for QtCreator use The QtCreator is quite broken regarding finding the mkspecs files; so to workaround it we must to add a symlink to it. The workaround was in place but in the wrong sysroot, it must to be in the /native/ one. Signed-off-by: Otavio Salvador Acked-by: Jonathan Liu --- classes/populate_sdk_qt5.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index 3b849e9fff..635dd6d3bf 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass @@ -27,7 +27,7 @@ toolchain_create_sdk_env_script_append () { echo 'export QT_CONF_PATH=${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script # make a symbolic link to mkspecs for compatibility with QTCreator - (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; \ + (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \ ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;) # Generate a qt.conf file to be deployed with the SDK From cee2a75ad66080a1b8694238ee5cfe2570225e4d Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Fri, 28 Feb 2014 10:33:52 +0100 Subject: [PATCH 325/347] nativesdk-qtbase-tools: disable Debian-style package renaming Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files are included in the nativesdk-qtbase-tools package. However, this together with the fact that the binaries are placed in a subdir "qt5" of bin will confuse the Debian-style package renaming logic in debian.bbclass, causing the resulting ipk package to be created as "nativesdk-libqt5core5". Signed-off-by: Jacob Kroon Acked-by: Otavio Salvador --- recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 3cb9b0eea6..884b1a62eb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -60,6 +60,12 @@ FILES_${PN}-tools = " \ ${OE_QMAKE_PATH_BINS}/* \ " +# qttools binaries are placed in a subdir of bin in order to avoid +# collisions with qt4. This would trigger debian.bbclass to rename the +# package, since it doesn't detect binaries in subdirs. Explicitly +# disable package auto-renaming for the tools-package. +DEBIAN_NOAUTONAME_${PN}-tools = "1" + QT_CONFIG_FLAGS += " \ -reduce-relocations \ -shared \ From 53242713da6ae01f2b1f7e674b00517390fe2bcb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 20 Feb 2014 14:31:13 -0300 Subject: [PATCH 326/347] packagegroup-qt5-qtcreator-debug: Add package group This allow for easy installation of needed packages for remote debugging using QtCreator. The qtdeclarative-plugins package provides the needed infrastructure to remotely debug QML application. Signed-off-by: Otavio Salvador Tested-by: Giulian Vivan --- .../packagegroup-qt5-qtcreator-debug.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb diff --git a/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb b/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb new file mode 100644 index 0000000000..b34dbffa91 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-qt5-qtcreator-debug.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. + +SUMMARY = "Remote debugging tools for QtCreator integration" +LICENSE = "MIT" + +inherit packagegroup + +# Override by distro if needed +VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon ?= "openssh-sshd" + +RDEPENDS_${PN} = " \ + gdbserver \ + ${VIRTUAL-RUNTIME_qtcreator-debug-ssh-daemon} \ + openssh-sftp-server \ + qtdeclarative-plugins \ +" From deb2473ee91c014c655098f20b9f8b33ff9a8bc1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 20 Feb 2014 14:34:01 -0300 Subject: [PATCH 327/347] populate_sdk_qt5.bbclass: Add support for qtcreator-debug This adds a new image feature for easier remote debugging with QtCreator. The qtcreator-debug needs to be added as a valid item for image features and having it inside the populate_sdk_qt5 is too late. User will see a parser error as OE-Core images does not inherit the classs. The possible workaround for it is to include it inside layer.conf file until a kind of "bbclassappend" support is in place. Signed-off-by: Otavio Salvador Tested-by: Giulian Vivan --- classes/populate_sdk_qt5.bbclass | 2 ++ conf/layer.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index 635dd6d3bf..c9219830e5 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass @@ -52,3 +52,5 @@ toolchain_create_sdk_env_script_append () { echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf } + +PACKAGE_GROUP_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" diff --git a/conf/layer.conf b/conf/layer.conf index 3b47b7f7a3..75d13a4651 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -22,3 +22,5 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" # other layers. BBFILE_PRIORITY_qt5-layer = "7" + +IMAGE_FEATURES[validitems] += "qtcreator-debug" From 69d2f31df603244dff240163df04133756a1a0d3 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Feb 2014 21:15:05 +0100 Subject: [PATCH 328/347] qtbase/qtwebkit: drop ICU variable Pango doesn't seem to be a drop-in replacement for ICU, so using it as a dependency for the -icu option won't work. QtWebKit has a hard dependency on icu. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 4 ---- recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit.inc | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e2a1662121..dfc1c7674b 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -3,10 +3,6 @@ inherit qmake5 -# Qt5 is dependent on icu for localization -ICU = "icu " -ICU_powerpc = "pango" - PACKAGECONFIG_OPENSSL ?= "openssl" QT_MODULE ?= "${BPN}" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 378f229b40..4fe6bd5e6f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,kms" # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) -PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" +PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index aea9dad089..c35504e79c 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee" -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" +DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" From c9e332597bd461de03dbb0eed429ecbe0c9a05a5 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Feb 2014 21:15:06 +0100 Subject: [PATCH 329/347] qtdeclarative: drop qtsvg dependency, add packageconfig for qtxmlpatterns The dependency on qtsvg seems to be a leftover from an old version. Version 5.2.1 of qtdeclarative doesn't include any reference to it. Depend on qtbase in case qtxmlpatterns gets disabled. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 12e650fae2..bd68955b4c 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -5,4 +5,15 @@ SRC_URI += " \ file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " -DEPENDS += "qtsvg qtxmlpatterns" +DEPENDS += "qtbase" + +PACKAGECONFIG ??= "qtxmlpatterns" +PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" + +do_configure_prepend() { + # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG + sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro + sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro +} + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" From 2bf30ae1d5321803acc0f15f49935dac50089dde Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Feb 2014 21:15:07 +0100 Subject: [PATCH 330/347] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors Use gstreamer for 1.x, gstreamer010 for 0.10.x. Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit.inc | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index c35504e79c..90bd981571 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -5,7 +5,29 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee" -DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt" + +PACKAGECONFIG ??= "gstreamer qtlocation qtsensors" +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" +PACKAGECONFIG[qtlocation] = ",,qtlocation" +PACKAGECONFIG[qtsensors] = ",,qtsensors" + +do_configure_prepend() { + # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(packagesExist(".*\.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(packagesExist(".*\.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable qtlocation test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf + # disable qtsensors test if it isn't enabled by PACKAGECONFIG + sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf +} + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}" # qtwebkit gets terribly big when linking with all debug info, disable by default QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" From c63c48b3ca8d7fd824b471fbac5e96bc1600e380 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Mon, 3 Mar 2014 18:00:03 +1100 Subject: [PATCH 331/347] qttools: add missing DEPENDS Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc index 8412db499b..0192f228f0 100644 --- a/recipes-qt/qt5/qttools.inc +++ b/recipes-qt/qt5/qttools.inc @@ -1,6 +1,6 @@ require qt5.inc -DEPENDS += "qtbase" +DEPENDS += "qtbase qtdeclarative qtwebkit qtxmlpatterns" SRC_URI += " \ file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ From ea5d8e0c1b04719e1606d823292d0beb1bae7cc2 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Mon, 3 Mar 2014 21:59:53 +1100 Subject: [PATCH 332/347] cmake: rename .bbappend to match new version from OE-core Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...ke-native_2.8.12.1.bbappend => cmake-native_2.8.12.2.bbappend} | 0 .../cmake/{cmake_2.8.12.1.bbappend => cmake_2.8.12.2.bbappend} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes-devtools/cmake/{cmake-native_2.8.12.1.bbappend => cmake-native_2.8.12.2.bbappend} (100%) rename recipes-devtools/cmake/{cmake_2.8.12.1.bbappend => cmake_2.8.12.2.bbappend} (100%) diff --git a/recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend b/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake-native_2.8.12.1.bbappend rename to recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend diff --git a/recipes-devtools/cmake/cmake_2.8.12.1.bbappend b/recipes-devtools/cmake/cmake_2.8.12.2.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake_2.8.12.1.bbappend rename to recipes-devtools/cmake/cmake_2.8.12.2.bbappend From 8c3c6fda694f8d86347d51978d345d476addf59f Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 5 Mar 2014 09:09:00 +1100 Subject: [PATCH 333/347] qtbase: fix mmsize argument parsing for linuxfb plugin Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 + ...-Fix-linuxfb-argument-mmsize-parsing.patch | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 4fe6bd5e6f..98fac85c2e 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -19,6 +19,7 @@ SRC_URI += "\ file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch new file mode 100644 index 0000000000..a31301e36a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch @@ -0,0 +1,42 @@ +From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Peter=20K=C3=BCmmel?= +Date: Fri, 7 Feb 2014 13:12:37 +0100 +Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing + +Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'. + +Upstream-Status: Backport + +Task-number: QTBUG-29133 +Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1 +Reviewed-by: Laszlo Agocs +Signed-off-by: Jonathan Liu +--- + src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp +index 735a43d..33a9523 100644 +--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp ++++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp +@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize() + foreach (const QString &arg, mArgs) { + if (arg == QLatin1String("nographicsmodeswitch")) + doSwitchToGraphicsMode = false; ++ else if (mmSizeRx.indexIn(arg) != -1) ++ userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); + else if (sizeRx.indexIn(arg) != -1) + userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt())); + else if (offsetRx.indexIn(arg) != -1) +@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize() + ttyDevice = ttyRx.cap(1); + else if (fbRx.indexIn(arg) != -1) + fbDevice = fbRx.cap(1); +- else if (mmSizeRx.indexIn(arg) != -1) +- userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); + } + + if (fbDevice.isEmpty()) { +-- +1.7.1 + From 201b3b2c89d77a6ef8ea6e5f6b63929429184994 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 5 Mar 2014 09:09:39 +1100 Subject: [PATCH 334/347] qtbase: prevent artifacts on raster windows using eglfs plugin Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 + .../0016-eglfs-Fix-quad-coordinates.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 98fac85c2e..8ca89494ce 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -20,6 +20,7 @@ SRC_URI += "\ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ + file://0016-eglfs-Fix-quad-coordinates.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch new file mode 100644 index 0000000000..92785e459e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch @@ -0,0 +1,39 @@ +From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs +Date: Thu, 23 Jan 2014 11:45:22 +0100 +Subject: [PATCH] eglfs: Fix quad coordinates + +Prevent artifacts on raster windows by properly mapping +the coordinates to [-1,1]. + +Upstream-Status: Backport + +Task-number: QTBUG-36370 +Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a +Reviewed-by: Andy Nichols +Signed-off-by: Jonathan Liu +--- + src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp +index 845bb5b..1efc4f7 100644 +--- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp ++++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp +@@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster) + QPoint tl = r.topLeft(); + QPoint br = r.bottomRight(); + ++ // Map to [-1,1] + GLfloat x1 = (tl.x() / sr.width()) * 2 - 1; +- GLfloat x2 = (br.x() / sr.width()) * 2 - 1; + GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1; +- GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1; ++ GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1; ++ GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1; + + if (!raster) + qSwap(y1, y2); +-- +1.7.1 + From fc06fb8ceb8eec4fe64463234ce6aaadd5f8a852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 25 Feb 2014 18:16:54 +0100 Subject: [PATCH 335/347] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * there is no kms around * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms) * in configure we find: | if [ "$CFG_KMS" = "yes" ]; then | if [ "$CFG_EGL" = "no" ]; then | echo "The KMS plugin requires EGL support and cannot be built" | exit 101 | fi | fi Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 8ca89494ce..2430035119 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -116,7 +116,7 @@ PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" -PACKAGECONFIG[kms] = "-kms,-no-kms,kms" +PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" From a036792a6270f18c971baeb72f92abbb91c4d73e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 24 Feb 2014 21:02:34 +0100 Subject: [PATCH 336/347] qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with -compile-examples option * -compile-examples option was added in upstream commit: commit 8ea19caacf281240411541b5af37c2f9a103a7d1 Author: Oswald Buddenhagen Date: Tue May 7 17:10:22 2013 +0200 Subject: add -compile-examples configure option Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 3 +- .../0012-qtbase-allow-build-of-examples.patch | 48 ------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2430035119..a6fb3b22c4 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -16,7 +16,6 @@ SRC_URI += "\ SRC_URI += "\ file://0010-qmake-is-already-built-in-qtbase-native.patch \ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ @@ -65,7 +64,7 @@ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[developer] = "-developer-build" PACKAGECONFIG[sm] = "-sm,-no-sm" PACKAGECONFIG[tests] = "-make tests,-nomake tests" -PACKAGECONFIG[examples] = "-make examples,-nomake examples" +PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples" PACKAGECONFIG[tools] = "-make tools,-nomake tools" # only for completeness, configure will add libs even if you try to explicitly remove it PACKAGECONFIG[libs] = "-make libs,-nomake libs" diff --git a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch deleted file mode 100644 index 9d46d2fb18..0000000000 --- a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 12/14] qtbase: allow build of examples -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this revert the following commit : - -commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 -Author: Oswald Buddenhagen -Date: Fri Dec 21 19:36:12 2012 +0100 - - do not actually build examples in production builds - - -developer-build enables an actual build of examples, based on the - assumption that developers want to test it (it can be still disabled - with -nomake examples). regular users otoh want only the examples - sources installed. - - Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 - Reviewed-by: Joerg Bornemann - -Signed-off-by: Eric Bénard ---- - mkspecs/features/qt_example_installs.prf | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 2db752c..ca1b0c7 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - allfiles -= doc - !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") - } -- -- !equals(TEMPLATE, subdirs):!compile_examples { -- TEMPLATE = aux -- CONFIG -= have_target qt staticlib dll -- SOURCES = -- INSTALLS -= target -- } - } --- -1.8.5.3 - From fbf9216fb9753e32618f1bf986e136423171b313 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 24 Feb 2014 21:20:58 +0100 Subject: [PATCH 337/347] qt5-git: bump SRCREVs to latest in 'release' branch * in some components there was just Bump MODULE_VERSION to 5.2.2 commit but bump them all for consistencty * we're testing newer revisions in order to narrow some QML issues we're seeing in runtime Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 4 +++- recipes-qt/qt5/qtbase_git.bb | 4 +++- recipes-qt/qt5/qtconnectivity_git.bb | 4 +++- recipes-qt/qt5/qtdeclarative_git.bb | 3 ++- recipes-qt/qt5/qtgraphicaleffects_git.bb | 4 +++- recipes-qt/qt5/qtimageformats_git.bb | 4 +++- recipes-qt/qt5/qtlocation_git.bb | 4 +++- recipes-qt/qt5/qtmultimedia_git.bb | 4 +++- recipes-qt/qt5/qtquick1_git.bb | 4 +++- recipes-qt/qt5/qtquickcontrols_git.bb | 4 +++- recipes-qt/qt5/qtscript_git.bb | 4 +++- recipes-qt/qt5/qtsensors_git.bb | 4 +++- recipes-qt/qt5/qtserialport_git.bb | 3 ++- recipes-qt/qt5/qtsvg_git.bb | 4 +++- recipes-qt/qt5/qtsystems_git.bb | 2 -- recipes-qt/qt5/qttools-native_git.bb | 4 +++- recipes-qt/qt5/qttools_git.bb | 4 +++- recipes-qt/qt5/qtwebkit-examples_git.bb | 4 +++- recipes-qt/qt5/qtwebkit_git.bb | 4 +++- recipes-qt/qt5/qtx11extras_git.bb | 4 +++- recipes-qt/qt5/qtxmlpatterns_git.bb | 4 +++- 21 files changed, 58 insertions(+), 22 deletions(-) diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index c69b631a8e..6f11bf3a85 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -7,4 +7,6 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 168 commits +SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4d55dbe613..1083983425 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 168 commits +SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index cca309b9b4..35e54d32a2 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${BPN}.inc -SRCREV = "2f2985b03f5202a9ab329f89de7317585af8c250" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 25 commits +SRCREV = "9902dfdbc44934ce2e8072bc237ca8cdbfb3402b" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 1b9decd356..e2d6ae585d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -2,4 +2,5 @@ require qt5-git.inc require ${PN}.inc QT_MODULE_BRANCH = "release" -SRCREV = "96e4f00db3bfd222146780251013501cfdd8baaa" +# v5.2.1 + 81 commits +SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 2f964fe6bf..b442069f52 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "740fbcf28012ade59087df945b4c6b8ae05b7a68" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 3 commits +SRCREV = "1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 8a39e2d757..e40bd3fdfb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "8548d1fe0985b3b680acef3135646aa4e876175c" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 1 commits +SRCREV = "dde6daeccdf0a3f8d49fe1777b49046576b12218" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index e1af5fb760..e498515112 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a74b31c16b4baeeb8047e1958eb1b6787dc885e8" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 13 commits +SRCREV = "2ba9fd5550eb7766c20b3a61679e88ec4a6c8a54" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 6e87fb37f2..e9fed1abe1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "658ad524f8ba9cbcae797aefbdf498ef9d364067" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 17 commits +SRCREV = "db7f7cc5654ddec60297259bc9f86f5f777749cd" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 636c4c91fc..d744aa8de7 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "3384daf6d1ab1fc15908866e2743f060a7461daa" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 2 commits +SRCREV = "07d8ce32b1112dcb590c793ee51cb713e514011b" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index be0fbba022..69c3353b08 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c7540702126251ca5f7cc78e685b970d06e48ce8" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 15 commits +SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index dd9b3a81be..2b86650c3f 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "3aadb5c9894d5fe92923cc6c5dd2a71949a49927" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 1 commits +SRCREV = "f89d64ca722acf4a1a38c5e136bb01eff2525978" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 767655f9bc..aedcc40eb6 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "832136829ece18885ef7ac35f4527d1d314aaea8" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 2 commits +SRCREV = "9a8319a39a06d6cf3163978301d650b8f3558c62" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 028c77fa77..3418259b47 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -2,4 +2,5 @@ require qt5-git.inc require ${PN}.inc QT_MODULE_BRANCH = "release" -SRCREV = "29e526ad5c1e2fe0996ba0a776d83ec86f7197d7" +# v5.2.1 + 28 commits +SRCREV = "03546732fa696467d23b24224fad2822bc6a9043" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 986b0c103b..b6032b7534 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "ef1c298cc27e15dd6f6bba95b605471d95bead6b" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 1 commits +SRCREV = "ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 7853355308..c264ab0d7b 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -4,6 +4,4 @@ require ${PN}.inc # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 -QT_MODULE_BRANCH = "dev" - SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102" diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 77c5a8d6ec..200f4277b5 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 13 commits +SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 77c5a8d6ec..200f4277b5 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 13 commits +SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 0cc5fbfe73..1f5df71894 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "0d6e9989eb2a15d130b2a132ddc196835a33c9b6" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 1 commits +SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 8ba7145c9f..047b37fd82 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "3dd07419f3f627ffd0a9efc3f7253cef145f14e5" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 18 commits +SRCREV = "a1b801fc98ccda988df41e08dc70fdbd50ecb513" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d6f82c0c36..d0a2a8cb07 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "766eaface63b98a248d49d6b70f367e9eebb8f95" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 1 commits +SRCREV = "dd7eec92e7a5f4383783cc161f638867572dc208" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index a51e6c1a01..28e45a4893 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,4 +1,6 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "f73a75f92a2e6036bbc183d7f63bfd8f42e8abc6" +QT_MODULE_BRANCH = "release" +# v5.2.1 + 4 commits +SRCREV = "eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0" From a93ebb736bb02c1c74bb8a4bd14476c725905ea3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 24 Feb 2014 23:55:52 +0100 Subject: [PATCH 338/347] qtdeclarative_git: drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch because it's already applied in upstream commit: commit d765ad8e3dabe44f276db9084b1d16164c4535e7 Author: Florian Hänel Date: Wed Jun 5 19:23:32 2013 +0200 Subject: Fix wrong calculation of viewPort for transitions Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 1 - recipes-qt/qt5/qtdeclarative_5.2.1.bb | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index bd68955b4c..4a186fdcbf 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -2,7 +2,6 @@ require qt5.inc SRC_URI += " \ file://0001-qmltestexample-fix-link.patch \ - file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " DEPENDS += "qtbase" diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb index 8e435cf609..eaa90bac38 100644 --- a/recipes-qt/qt5/qtdeclarative_5.2.1.bb +++ b/recipes-qt/qt5/qtdeclarative_5.2.1.bb @@ -1,5 +1,9 @@ require qt5-${PV}.inc require ${PN}.inc +SRC_URI += " \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ +" + SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc" SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690" From 818cc2d11b02ceb02ac27401fedcaf1e1db91d36 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Mar 2014 01:39:24 +0100 Subject: [PATCH 339/347] qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 1 - recipes-qt/qt5/qtbase_5.2.1.bb | 2 ++ recipes-qt/qt5/qtbase_git.bb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index a6fb3b22c4..89736bea19 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -18,7 +18,6 @@ SRC_URI += "\ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ file://0016-eglfs-Fix-quad-coordinates.patch \ " diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb index c106d2278b..4257367a01 100644 --- a/recipes-qt/qt5/qtbase_5.2.1.bb +++ b/recipes-qt/qt5/qtbase_5.2.1.bb @@ -1,5 +1,7 @@ require qt5-${PV}.inc require ${PN}.inc +SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch" + SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1083983425..07dd936df3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -2,5 +2,5 @@ require qt5-git.inc require ${PN}.inc QT_MODULE_BRANCH = "release" -# v5.2.1 + 168 commits -SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f" +# v5.2.1 + 172 commits +SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42" From 79fcaa9d61fbecdcf2d75efb00682b66ba9deeb6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Mar 2014 07:47:26 -0700 Subject: [PATCH 340/347] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider * Provide the license text Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- conf/layer.conf | 2 + licenses/NOKIA-TPLA-2.4 | 628 ++++++++++++++++++++++++++++++++++++++++ recipes-qt/qt5/qt3d.inc | 2 +- 3 files changed, 631 insertions(+), 1 deletion(-) create mode 100644 licenses/NOKIA-TPLA-2.4 diff --git a/conf/layer.conf b/conf/layer.conf index 75d13a4651..aacfd7843d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -23,4 +23,6 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_qt5-layer = "7" +LICENSE_PATH += "${LAYERDIR}/licenses" + IMAGE_FEATURES[validitems] += "qtcreator-debug" diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/NOKIA-TPLA-2.4 new file mode 100644 index 0000000000..c71a330e4a --- /dev/null +++ b/licenses/NOKIA-TPLA-2.4 @@ -0,0 +1,628 @@ +TECHNOLOGY PREVIEW LICENSE AGREEMENT + +For individuals and/or legal entities resident in the Americas (North +America, Central America and South America), the applicable licensing +terms are specified under the heading "Technology Preview License +Agreement: The Americas". + +For individuals and/or legal entities not resident in The Americas, the +applicable licensing terms are specified under the heading "Technology +Preview License Agreement: Rest of the World". + + +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas +Agreement version 2.4 + +This Technology Preview License Agreement ("Agreement")is a legal agreement +between Digia USA, Inc. ("Digia"), with its registered office at 32 W. +Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904, +U.S.A. and you (either an individual or a legal entity) ("Licensee") +for the Licensed Software (as defined below). + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in such +entity, is able to direct its affairs and/or to control the composition +of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using the +Licensed Software which may include portions of the Licensed Software. + +"Term" shall mean the period of time six (6) months from the later of +(a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Digia. If no specific Effective Date +is set forth in the Agreement, the Effective Date shall be deemed to be +the date the Licensed Software was initially delivered to Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Digia to Licensee in conjunction with this Agreement. + +"Party" or "Parties" shall mean Licensee and/or Digia. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Digia regarding the Licensed Software, Digia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any existing +patent rights of Licensee. To the extent Licensee owns or controls any +patents for such Feedback Licensee hereby grants to Digia and its +Affiliates, a worldwide, perpetual, non-transferable, sublicensable, +royalty-free license to (i) use, copy and modify Feedback and to create +derivative works thereof, (ii) to make (and have made), use, import, +sell, offer for sale, lease, dispose, offer for disposal or otherwise +exploit any products or services of Digia containing Feedback, and +(iii) sublicense all the foregoing rights to third party licensees and +customers of Digia and/or its Affiliates. + + +3. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If Licensee +does not agree to the terms of this Agreement, Licensee may not install, +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance +of the terms and conditions of this Agreement, Digia grants Licensee the +right to use the Licensed Software in the manner provided below. + + +4. LICENSES + +4.1. Using and Copying + +Digia grants to Licensee a non-exclusive, non-transferable, time-limited +license to use and copy the Licensed Software for sole purpose of +designing, developing and testing Applications, and evaluating and the +Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2 No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3 No Technical Support + +Digia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5. PRE-RELEASE CODE +The Licensed Software contains pre-release code that is not at the level +of performance and compatibility of a final, generally available, +product offering. The Licensed Software may not operate correctly and +may be substantially modified prior to the first commercial product +release, if any. Digia is not obligated to make this or any later +version of the Licensed Software commercially available. The License +Software is "Not for Commercial Use" and may only be used for the +purposes described in Section 4. The Licensed Software may not be used +in a live operating environment where it may be relied upon to perform +in the same manner as a commercially released product or with data that +has not been sufficiently backed up. + +6. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or code +(collectively "Third Party Software") to implement various functions. +Third Party Software does not comprise part of the Licensed Software. In +some cases, access to Third Party Software may be included along with +the Licensed Software delivery as a convenience for development and +testing only. Such source code and libraries may be listed in the +".../src/3rdparty" source tree delivered with the Licensed Software or +documented in the Licensed Software where the Third Party Software is +used, as may be amended from time to time, do not comprise the Licensed +Software. Licensee acknowledges (1) that some part of Third Party +Software may require additional licensing of copyright and patents from +the owners of such, and (2) that distribution of any of the Licensed +Software referencing any portion of a Third Party Software may require +appropriate licensing from such third parties. + + +7. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Digia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +8. LIMITATION OF LIABILITY + +If, Digia's warranty disclaimer notwithstanding, Digia is held liable to +Licensee, whether in contract, tort or any other legal theory, based on +the Licensed Software, Digia's entire liability to Licensee and +Licensee's exclusive remedy shall be, at Digia's option, either (A) +return of the price Licensee paid for the Licensed Software, or (B) +repair or replacement of the Licensed Software, provided Licensee +returns to Digia all copies of the Licensed Software as originally +delivered to Licensee. Digia shall not under any circumstances be liable +to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall Digia under +any circumstances be liable for special damages, punitive or exemplary +damages, damages for loss of profits or interruption of business or for +loss or corruption of data. Any award of damages from Digia to Licensee +shall not exceed the total amount Licensee has paid to Digia in +connection with this Agreement. + + +9. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it shall +have access to information about the other party's business, business +methods, business plans, customers, business relations, technology, and +other information, including the terms of this Agreement, that is +confidential and of great value to the other party, and the value of +which would be significantly reduced if disclosed to third parties (the +"Confidential Information"). Accordingly, when a party (the "Receiving +Party") receives Confidential Information from another party (the +"Disclosing Party"), the Receiving Party shall, and shall obligate its +employees and agents and employees and agents of its Affiliates to: (i) +maintain the Confidential Information in strict confidence; (ii) not +disclose the Confidential Information to a third party without the +Disclosing Party's prior written approval; and (iii) not, directly or +indirectly, use the Confidential Information for any purpose other than +for exercising its rights and fulfilling its responsibilities pursuant +to this Agreement. Each party shall take reasonable measures to protect +the Confidential Information of the other party, which measures shall +not be less than the measures taken by such party to protect its own +confidential and proprietary information. + +"Confidential Information" shall not include information that (a) is or +becomes generally known to the public through no act or omission of the +Receiving Party; (b) was in the Receiving Party's lawful possession +prior to the disclosure hereunder and was not subject to limitations on +disclosure or use; (c) is developed by the Receiving Party without +access to the Confidential Information of the Disclosing Party or by +persons who have not had access to the Confidential Information of the +Disclosing Party as proven by the written records of the Receiving +Party; (d) is lawfully disclosed to the Receiving Party without +restrictions, by a third party not under an obligation of +confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall assert +the privileged and confidential nature of the information and cooperate +fully with the Disclosing Party to protect against and prevent +disclosure of any Confidential Information and to limit the scope of +disclosure and the dissemination of disclosed Confidential Information +by all legally available means. + +The obligations of the Receiving Party under this Section shall continue +during the Initial Term and for a period of five (5) years after +expiration or termination of this Agreement. To the extent that the +terms of the Non-Disclosure Agreement between Digia and Licensee +conflict with the terms of this Section 9, this Section 9 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +10. GENERAL PROVISIONS + +10.1 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the prior +written consent of Digia, which shall not be unreasonably withheld. + +10.2 Termination + +Digia may terminate the Agreement at any time immediately upon written +notice by Digia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Digia all +copies of Licensed Software that were supplied by Digia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Digia a written confirmation that this has occurred. + +10.3 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, +10.5, 10.6, 10.7, and 10.8 of this Agreement. + +10.4 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with this +Agreement ("Non-Disclosure Agreement"), if any, shall be subject to +Section 9. No modification of this Agreement shall be effective unless +contained in a writing executed by an authorized representative of each +party. No term or condition contained in Licensee's purchase order shall +apply unless expressly accepted by Digia in writing. If any provision of +the Agreement is found void or unenforceable, the remainder shall remain +valid and enforceable according to its terms. If any remedy provided is +determined to have failed for its essential purpose, all limitations of +liability and exclusions of damages set forth in this Agreement shall +remain in effect. + +10.5 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall fully +comply with all applicable export license restrictions and requirements +as well as with all laws and regulations relating to the importation of +the Licensed Software and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software., + +10.6 Governing Law and Legal Venue + +This Agreement shall be governed by and construed in accordance with the +federal laws of the United States of America and the internal laws of +the State of New York without given effect to any choice of law rule +that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction of +the United States District Court for the Southern District of New York +(or if such court lacks jurisdiction, the state courts of the State of +New York) for the purposes of any action, claim, suit or proceeding +between the Parties in connection with any controversy, claim, or +dispute arising out of or relating to this Agreement; and (b) hereby +waives, and agrees not to assert by way of motion, as a defense or +otherwise, in any such action, claim, suit or proceeding, any claim that +is not personally subject to the jurisdiction of such court(s), that the +action, claim, suit or proceeding is brought in an inconvenient forum or +that the venue of the action, claim, suit or proceeding is improper. +Notwithstanding the foregoing, nothing in this Section 9.6 is intended +to, or shall be deemed to, constitute a submission or consent to, or +selection of, jurisdiction, forum or venue for any action for patent +infringement, whether or not such action relates to this Agreement. + +10.7 No Implied License + +There are no implied licenses or other implied rights granted under this +Agreement, and all rights, save for those expressly granted hereunder, +shall remain with Digia and its licensors. In addition, no licenses or +immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by Digia under this +Agreement. + +10.8 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if Licensee +is a U.S. Government End User. The Licensed Software is a "commercial +item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), +consisting of "commercial computer software" and "commercial computer +software documentation," as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users acquire +the Licensed Software with only those rights set forth herein. The +Licensed Software (including related documentation) is provided to U.S. +Government End Users: (a) only as a commercial end item; and (b) only +pursuant to this Agreement. + + + + + +TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World +Agreement version 2.4 + +This Technology Preview License Agreement ("Agreement") is a legal +agreement between Digia Finland Ltd ("Digia"), with its registered office at +Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a +legal entity) ("Licensee") for the Licensed Software. + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in such +entity, is able to direct its affairs and/or to control the composition +of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using the +Licensed Software which may include portions of the Licensed Software. + +"Term" shall mean the period of time six (6) months from the later of +(a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Digia. If no specific Effective Date +is set forth in the Agreement, the Effective Date shall be deemed to be +the date the Licensed Software was initially delivered to Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Digia to Licensee in conjunction with this Agreement. + +"Party" or "Parties" shall mean Licensee and/or Digia. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Digia regarding the Licensed Software, Digia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any existing +patent rights of Licensee. To the extent Licensee owns or controls any +patents for such Feedback Licensee hereby grants to Digia and its +Affiliates, a worldwide, perpetual, non-transferable, sublicensable, +royalty-free license to (i) use, copy and modify Feedback and to create +derivative works thereof, (ii) to make (and have made), use, import, +sell, offer for sale, lease, dispose, offer for disposal or otherwise +exploit any products or services of Digia containing Feedback, and +(iii) sublicense all the foregoing rights to third party licensees and +customers of Digia and/or its Affiliates. + +3. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If Licensee +does not agree to the terms of this Agreement, Licensee may not install, +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance +of the terms and conditions of this Agreement, Digia grants Licensee the +right to use the Licensed Software in the manner provided below. + + +4. LICENSES + +4.1. Using and Copying + +Digia grants to Licensee a non-exclusive, non-transferable, time-limited +license to use and copy the Licensed Software for sole purpose of +designing, developing and testing Applications, and evaluating and the +Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2 No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3 No Technical Support + +Digia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5. PRE-RELEASE CODE + +The Licensed Software contains pre-release code that is not at the level +of performance and compatibility of a final, generally available, +product offering. The Licensed Software may not operate correctly and +may be substantially modified prior to the first commercial product +release, if any. Digia is not obligated to make this or any later +version of the Licensed Software commercially available. The License +Software is "Not for Commercial Use" and may only be used for the +purposes described in Section 4. The Licensed Software may not be used +in a live operating environment where it may be relied upon to perform +in the same manner as a commercially released product or with data that +has not been sufficiently backed up. + +6. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or code +(collectively "Third Party Software") to implement various functions. +Third Party Software does not comprise part of the Licensed Software. In +some cases, access to Third Party Software may be included along with +the Licensed Software delivery as a convenience for development and +testing only. Such source code and libraries may be listed in the +".../src/3rdparty" source tree delivered with the Licensed Software or +documented in the Licensed Software where the Third Party Software is +used, as may be amended from time to time, do not comprise the Licensed +Software. Licensee acknowledges (1) that some part of Third Party +Software may require additional licensing of copyright and patents from +the owners of such, and (2) that distribution of any of the Licensed +Software referencing any portion of a Third Party Software may require +appropriate licensing from such third parties. + + +7. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Digia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +8. LIMITATION OF LIABILITY + +If, Digia's warranty disclaimer notwithstanding, Digia is held liable to +Licensee, whether in contract, tort or any other legal theory, based on +the Licensed Software, Digia's entire liability to Licensee and +Licensee's exclusive remedy shall be, at Digia's option, either (A) +return of the price Licensee paid for the Licensed Software, or (B) +repair or replacement of the Licensed Software, provided Licensee +returns to Digia all copies of the Licensed Software as originally +delivered to Licensee. Digia shall not under any circumstances be liable +to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall Digia under +any circumstances be liable for special damages, punitive or exemplary +damages, damages for loss of profits or interruption of business or for +loss or corruption of data. Any award of damages from Digia to Licensee +shall not exceed the total amount Licensee has paid to Digia in +connection with this Agreement. + + +9. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it shall +have access to information about the other party's business, business +methods, business plans, customers, business relations, technology, and +other information, including the terms of this Agreement, that is +confidential and of great value to the other party, and the value of +which would be significantly reduced if disclosed to third parties (the +"Confidential Information"). Accordingly, when a party (the "Receiving +Party") receives Confidential Information from another party (the +"Disclosing Party"), the Receiving Party shall, and shall obligate its +employees and agents and employees and agents of its Affiliates to: (i) +maintain the Confidential Information in strict confidence; (ii) not +disclose the Confidential Information to a third party without the +Disclosing Party's prior written approval; and (iii) not, directly or +indirectly, use the Confidential Information for any purpose other than +for exercising its rights and fulfilling its responsibilities pursuant +to this Agreement. Each party shall take reasonable measures to protect +the Confidential Information of the other party, which measures shall +not be less than the measures taken by such party to protect its own +confidential and proprietary information. + +"Confidential Information" shall not include information that (a) is or +becomes generally known to the public through no act or omission of the +Receiving Party; (b) was in the Receiving Party's lawful possession +prior to the disclosure hereunder and was not subject to limitations on +disclosure or use; (c) is developed by the Receiving Party without +access to the Confidential Information of the Disclosing Party or by +persons who have not had access to the Confidential Information of the +Disclosing Party as proven by the written records of the Receiving +Party; (d) is lawfully disclosed to the Receiving Party without +restrictions, by a third party not under an obligation of +confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall assert +the privileged and confidential nature of the information and cooperate +fully with the Disclosing Party to protect against and prevent +disclosure of any Confidential Information and to limit the scope of +disclosure and the dissemination of disclosed Confidential Information +by all legally available means. + +The obligations of the Receiving Party under this Section shall continue +during the Initial Term and for a period of five (5) years after +expiration or termination of this Agreement. To the extent that the +terms of the Non-Disclosure Agreement between Digia and Licensee +conflict with the terms of this Section 9, this Section 9 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +10. GENERAL PROVISIONS + +10.1 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the prior +written consent of Digia, which shall not be unreasonably withheld. + +10.2 Termination + +Digia may terminate the Agreement at any time immediately upon written +notice by Digia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Digia all +copies of Licensed Software that were supplied by Digia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Digia a written confirmation that this has occurred. + +10.3 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, +10.5, 10.6, 10.7, and 10.8 of this Agreement. + +10.4 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with this +Agreement ("Non-Disclosure Agreement"), if any, shall be subject to +Section 9. No modification of this Agreement shall be effective unless +contained in a writing executed by an authorized representative of each +party. No term or condition contained in Licensee's purchase order shall +apply unless expressly accepted by Digia in writing. If any provision of +the Agreement is found void or unenforceable, the remainder shall remain +valid and enforceable according to its terms. If any remedy provided is +determined to have failed for its essential purpose, all limitations of +liability and exclusions of damages set forth in this Agreement shall +remain in effect. + +10.5 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall fully +comply with all applicable export license restrictions and requirements +as well as with all laws and regulations relating to the importation of +the Licensed Software and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software., + +10.6 Governing Law and Legal Venue + +This Agreement shall be construed and interpreted in accordance with the +laws of Finland, excluding its choice of law provisions. Any disputes +arising out of or relating to this Agreement shall be resolved in +arbitration under the Rules of Arbitration of the Chamber of Commerce of +Helsinki, Finland. The arbitration tribunal shall consist of one (1), or +if either Party so requires, of three (3), arbitrators. The award shall +be final and binding and enforceable in any court of competent +jurisdiction. The arbitration shall be held in Helsinki, Finland and the +process shall be conducted in the English language. + +10.7 No Implied License + +There are no implied licenses or other implied rights granted under this +Agreement, and all rights, save for those expressly granted hereunder, +shall remain with Digia and its licensors. In addition, no licenses or +immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by Digia under this +Agreement. + +10.8 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if Licensee +is a U.S. Government End User. The Licensed Software is a "commercial +item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), +consisting of "commercial computer software" and "commercial computer +software documentation," as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users acquire +the Licensed Software with only those rights set forth herein. The +Licensed Software (including related documentation) is provided to U.S. +Government End Users: (a) only as a commercial end item; and (b) only +pursuant to this Agreement. + + + + diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index cfff5ee871..78b9ecc515 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -2,7 +2,7 @@ require qt5.inc DEPENDS += "qtdeclarative" -LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL | GPL-3.0" +LICENSE = "GFDL-1.3 & LGPL-2.1 & NOKIA-TPLA-2.4 | GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ From 1fa7f364f682e5cfaa9d6e565b7ae6b8ec2a90ff Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 16 Mar 2014 01:54:39 +1100 Subject: [PATCH 341/347] licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4 The license agreement doesn't mention Nokia anymore after Qt was acquired by Digia. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- licenses/{NOKIA-TPLA-2.4 => DIGIA-TPLA-2.4} | 0 recipes-qt/qt5/qt3d.inc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename licenses/{NOKIA-TPLA-2.4 => DIGIA-TPLA-2.4} (100%) diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/DIGIA-TPLA-2.4 similarity index 100% rename from licenses/NOKIA-TPLA-2.4 rename to licenses/DIGIA-TPLA-2.4 diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 78b9ecc515..74c4cadabf 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -2,7 +2,7 @@ require qt5.inc DEPENDS += "qtdeclarative" -LICENSE = "GFDL-1.3 & LGPL-2.1 & NOKIA-TPLA-2.4 | GPL-3.0" +LICENSE = "GFDL-1.3 & LGPL-2.1 & DIGIA-TPLA-2.4 | GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ From 303f97f4a6d5293b55640d8ab88995be3f5975df Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 11:53:03 +0100 Subject: [PATCH 342/347] qtbase: Allow to build without any QPA backend When disabling fb, directfb, x11, widgets and OpenGL qtbase will still complain that no QPA backend is available. Always add the -no-qpa-platform-guard parameter --- recipes-qt/qt5/qtbase.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 89736bea19..2ebf311f43 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -132,6 +132,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ + -no-qpa-platform-guard \ ${EXTRA_OECONF} \ " From 6d25c7dda8515aa721a00f5973fac3c8393fed31 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 13:26:28 +0100 Subject: [PATCH 343/347] tufao: Add the tufao http server implementation Add a patch to hardcode some paths as otherwise it tries to install files into the directories of cmake-native and qmake-native --- recipes-qt/tufao/files/hardcode_paths.patch | 21 +++++++++++++++++++++ recipes-qt/tufao/files/qt_sysroot.patch | 13 +++++++++++++ recipes-qt/tufao/tufao1_1.0.2.bb | 15 +++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 recipes-qt/tufao/files/hardcode_paths.patch create mode 100644 recipes-qt/tufao/files/qt_sysroot.patch create mode 100644 recipes-qt/tufao/tufao1_1.0.2.bb diff --git a/recipes-qt/tufao/files/hardcode_paths.patch b/recipes-qt/tufao/files/hardcode_paths.patch new file mode 100644 index 0000000000..cbfe4baa87 --- /dev/null +++ b/recipes-qt/tufao/files/hardcode_paths.patch @@ -0,0 +1,21 @@ +diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt +index 25891a5..dffce68 100644 +--- a/pkg/CMakeLists.txt ++++ b/pkg/CMakeLists.txt +@@ -9,7 +9,7 @@ configure_file(FindTufao.cmake.in FindTufao${TUFAO_VERSION_MAJOR}.cmake @ONLY) + + # Install info + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tufao${TUFAO_VERSION_MAJOR}.prf" +- DESTINATION "${QT_MKSPECS_DIR}/features" ++ DESTINATION "/usr/lib/qt5/mkspecs/features" + COMPONENT development + ) + if(PKG_CONFIG_FOUND) +@@ -19,6 +19,6 @@ if(PKG_CONFIG_FOUND) + ) + endif(PKG_CONFIG_FOUND) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindTufao${TUFAO_VERSION_MAJOR}.cmake" +- DESTINATION "${CMAKE_ROOT}/Modules" ++ DESTINATION "/usr/share/cmake-2.8/Modules" + COMPONENT development + ) diff --git a/recipes-qt/tufao/files/qt_sysroot.patch b/recipes-qt/tufao/files/qt_sysroot.patch new file mode 100644 index 0000000000..71ff92ed56 --- /dev/null +++ b/recipes-qt/tufao/files/qt_sysroot.patch @@ -0,0 +1,13 @@ +diff --git a/pkg/tufao.prf.in b/pkg/tufao.prf.in +index 8fa53d9..2560df3 100644 +--- a/pkg/tufao.prf.in ++++ b/pkg/tufao.prf.in +@@ -1,5 +1,5 @@ + QT += network + + DEFINES += TUFAO_VERSION_MAJOR=@TUFAO_VERSION_MAJOR@ +-INCLUDEPATH += "@CMAKE_INSTALL_PREFIX@/@includedir@" +-LIBS += -L"@CMAKE_INSTALL_PREFIX@/@libdir@" -l@TUFAO_LIBRARY@ ++INCLUDEPATH += "$$[QT_SYSROOT]@CMAKE_INSTALL_PREFIX@/@includedir@" ++LIBS += -L"$$[QT_SYSROOT]@CMAKE_INSTALL_PREFIX@/@libdir@" -l@TUFAO_LIBRARY@ + diff --git a/recipes-qt/tufao/tufao1_1.0.2.bb b/recipes-qt/tufao/tufao1_1.0.2.bb new file mode 100644 index 0000000000..8fea0218f7 --- /dev/null +++ b/recipes-qt/tufao/tufao1_1.0.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Tufao webserver" +HOMEPAGE = "http://vinipsmaker.github.io/tufao/" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" + +inherit cmake_qt5 + +SRC_URI = "git://github.com/vinipsmaker/tufao;branch=master \ + file://hardcode_paths.patch \ + file://qt_sysroot.patch " +S= "${WORKDIR}/git" +SRCREV = "0d37027f8e7a64bc58196b963dffc72e13420c7a" + +FILES_${PN}-dev += "${datadir}/cmake-* ${libdir}/qt5/mkspecs/features/*" From d736c151e7c781f089a4770bb81e9aef44ff713a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 13:42:14 +0100 Subject: [PATCH 344/347] libsystemd-qt: Add latest git version of systemd bindings --- .../libsystemd-qt/files/fix-pkgconfig.patch | 18 ++++++++++++++++++ recipes-qt/libsystemd-qt/libsystemd-qt_git.bb | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 recipes-qt/libsystemd-qt/files/fix-pkgconfig.patch create mode 100644 recipes-qt/libsystemd-qt/libsystemd-qt_git.bb diff --git a/recipes-qt/libsystemd-qt/files/fix-pkgconfig.patch b/recipes-qt/libsystemd-qt/files/fix-pkgconfig.patch new file mode 100644 index 0000000000..f20de0ea2e --- /dev/null +++ b/recipes-qt/libsystemd-qt/files/fix-pkgconfig.patch @@ -0,0 +1,18 @@ +diff --git a/QtSystemd.pc.cmake b/QtSystemd.pc.cmake +index 6b6c0e5..c3bdd42 100644 +--- a/QtSystemd.pc.cmake ++++ b/QtSystemd.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ ++libdir=${prefix}/lib@LIB_SUFFIX@ + includedir=${prefix}/include/QtSystemd + + Name: QtSystemd +@@ -9,4 +9,4 @@ Version: @VERSION@ + + Requires: systemd + Cflags: -I${includedir} @CMAKE_INCLUDE_PATH@ +-Libs: -L${libdir} -lQtSystemd @CMAKE_LIBRARY_PATH@ ++Libs: -L${libdir} -lQtSystemd diff --git a/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb b/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb new file mode 100644 index 0000000000..0a6aeb0ea0 --- /dev/null +++ b/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Qt Wrapper for systemd" +HOMEPAGE = "https://github.com/ilpianista/libsystemd-qt" + +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit cmake_qt5 + +DEPENDS = "systemd" +RDEPENDS_${PN} = "dbus" + +PV = "208+git${SRCPV}" + +SRC_URI = "git://github.com/ilpianista/libsystemd-qt;branch=master \ + file://fix-pkgconfig.patch" +S= "${WORKDIR}/git" +SRCREV = "398056b33314fc583dd8d8422e5c2f8b797fdb3b" + +FILES_${PN}-dev += "${libdir}/cmake/* ${libdir}/qt5/mkspecs/features/*" From b03408e2b47077d20a7dec66b173a0003c02541c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 11:52:33 +0100 Subject: [PATCH 345/347] cmake: Be able to use this layer with Dora --- .../{cmake_2.8.12.2.bbappend => cmake-native_2.8.11.2.bbappend} | 2 +- .../{cmake-native_2.8.12.2.bbappend => cmake_2.8.11.2.bbappend} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename recipes-devtools/cmake/{cmake_2.8.12.2.bbappend => cmake-native_2.8.11.2.bbappend} (90%) rename recipes-devtools/cmake/{cmake-native_2.8.12.2.bbappend => cmake_2.8.11.2.bbappend} (100%) diff --git a/recipes-devtools/cmake/cmake_2.8.12.2.bbappend b/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend similarity index 90% rename from recipes-devtools/cmake/cmake_2.8.12.2.bbappend rename to recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend index ebacf720e6..924228701b 100644 --- a/recipes-devtools/cmake/cmake_2.8.12.2.bbappend +++ b/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend @@ -14,7 +14,7 @@ do_configure_prepend() { sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt +# sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt } diff --git a/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend similarity index 100% rename from recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend rename to recipes-devtools/cmake/cmake_2.8.11.2.bbappend From 99d0f3a51bf7ee94ebc8ce0da411d5e56a367451 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 11:54:27 +0100 Subject: [PATCH 346/347] qtbase: Hacks to shrink qtbase This can be done more properly in our conf/local.conf but I am very lazy and do it this way. :} --- recipes-qt/qt5/qtbase.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2ebf311f43..09bf4811dd 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -44,18 +44,13 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" +PACKAGECONFIG_DEFAULT ?= "dbus udev tools libs" PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ ${PACKAGECONFIG_DEFAULT} \ ${PACKAGECONFIG_OPENSSL} \ - ${PACKAGECONFIG_GL} \ - ${PACKAGECONFIG_FB} \ - ${PACKAGECONFIG_X11} \ - ${PACKAGECONFIG_FONTS} \ ${PACKAGECONFIG_SYSTEM} \ - ${PACKAGECONFIG_MULTIMEDIA} \ ${PACKAGECONFIG_DISTRO} \ " From 3a96660f64cd1c2f2237201c8ed53b248beac3be Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 20:38:39 +0100 Subject: [PATCH 347/347] libsystemd-qt: Add new API for systemd --- ...pper-for-the-resetFailedUnit-command.patch | 71 +++++++++++++++++++ recipes-qt/libsystemd-qt/libsystemd-qt_git.bb | 3 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/libsystemd-qt/files/0001-Add-wrapper-for-the-resetFailedUnit-command.patch diff --git a/recipes-qt/libsystemd-qt/files/0001-Add-wrapper-for-the-resetFailedUnit-command.patch b/recipes-qt/libsystemd-qt/files/0001-Add-wrapper-for-the-resetFailedUnit-command.patch new file mode 100644 index 0000000000..6752f3dc62 --- /dev/null +++ b/recipes-qt/libsystemd-qt/files/0001-Add-wrapper-for-the-resetFailedUnit-command.patch @@ -0,0 +1,71 @@ +From 0b30c0e223f35ec7e27b04142135afc3f298a776 Mon Sep 17 00:00:00 2001 +From: Holger Hans Peter Freyther +Date: Fri, 21 Mar 2014 20:25:19 +0100 +Subject: [PATCH] Add wrapper for the resetFailedUnit command + +--- + src/sdmanager.cpp | 14 ++++++++++++++ + src/sdmanager.h | 2 ++ + src/sdmanager_p.h | 1 + + 3 files changed, 17 insertions(+) + +diff --git a/src/sdmanager.cpp b/src/sdmanager.cpp +index 6bcd459..b3b41f7 100644 +--- a/src/sdmanager.cpp ++++ b/src/sdmanager.cpp +@@ -333,6 +333,15 @@ Job::Ptr SystemdPrivate::stopUnit(const QString &name, const Systemd::Mode mode) + return job; + } + ++void SystemdPrivate::resetFailedUnit(const QString& name) ++{ ++ QDBusPendingReply reply = isdface.ResetFailedUnit(name); ++ reply.waitForFinished(); ++ ++ if (reply.isError()) ++ qDebug() << reply.error().message(); ++} ++ + QString SystemdPrivate::modeToString(const Systemd::Mode mode) + { + switch(mode) { +@@ -447,6 +456,11 @@ Job::Ptr Systemd::stopUnit(const QString &name, const Systemd::Mode mode) + return globalSystemd()->stopUnit(name, mode); + } + ++void Systemd::resetFailedUnit(const QString &name) ++{ ++ return globalSystemd()->resetFailedUnit(name); ++} ++ + Notifier* Systemd::notifier() + { + return globalSystemd(); +diff --git a/src/sdmanager.h b/src/sdmanager.h +index 80fb25a..de09f43 100644 +--- a/src/sdmanager.h ++++ b/src/sdmanager.h +@@ -185,6 +185,8 @@ namespace Systemd + */ + SDQT_EXPORT Job::Ptr stopUnit(const QString &name, const Mode mode); + ++ SDQT_EXPORT void resetFailedUnit(const QString &name); ++ + SDQT_EXPORT Notifier* notifier(); + } + +diff --git a/src/sdmanager_p.h b/src/sdmanager_p.h +index defee8f..674ce4f 100644 +--- a/src/sdmanager_p.h ++++ b/src/sdmanager_p.h +@@ -53,6 +53,7 @@ public: + Job::Ptr restartUnit(const QString &name, const Mode mode); + Job::Ptr startUnit(const QString &name, const Mode mode); + Job::Ptr stopUnit(const QString &name, const Mode mode); ++ void resetFailedUnit(const QString &name); + + protected Q_SLOTS: + void onJobNew(const uint id, const QDBusObjectPath &job, const QString &unit); +-- +1.9.0 + diff --git a/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb b/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb index 0a6aeb0ea0..1bfcd780e9 100644 --- a/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb +++ b/recipes-qt/libsystemd-qt/libsystemd-qt_git.bb @@ -12,7 +12,8 @@ RDEPENDS_${PN} = "dbus" PV = "208+git${SRCPV}" SRC_URI = "git://github.com/ilpianista/libsystemd-qt;branch=master \ - file://fix-pkgconfig.patch" + file://fix-pkgconfig.patch \ + file://0001-Add-wrapper-for-the-resetFailedUnit-command.patch " S= "${WORKDIR}/git" SRCREV = "398056b33314fc583dd8d8422e5c2f8b797fdb3b"