From 7a58995591f7612fec8ea6b6171eefffb75b6960 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 26 Sep 2016 14:02:11 -0700 Subject: layer.conf: add LAYERVERSION and LAYERDEPENDS We just depend on "core". Signed-off-by: Joe Slater Signed-off-by: Martin Jansa --- conf/layer.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/layer.conf b/conf/layer.conf index b7207e63..73ce00a6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -23,6 +23,12 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_qt5-layer = "7" +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_qt5-layer = "1" + +LAYERDEPENDS_qt5-layer = "core" + LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -- cgit v1.2.3 From 3a8679417f205d1134989e7baafe239aafe3f1bc Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Sun, 18 Sep 2016 13:55:18 +0800 Subject: qtmultimedia: fix conflicting declaration error The error info is as the follow: | In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: | /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:474:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' | typedef ptrdiff_t GLsizeiptr; | ^ | In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: | /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:67:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr' | typedef khronos_ssize_t GLsizeiptr; | ^ | In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: | /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:475:19: error: conflicting declaration 'typedef ptrdiff_t GLintptr' | typedef ptrdiff_t GLintptr; | ^ | In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: | /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:68:26: note: previous declaration as 'typedef khronos_intptr_t GLintptr' | typedef khronos_intptr_t GLintptr; | ^ Here, use lgl2.h instead of gl2.h and gl2ext.h, fix the "conflicting declaration" error. Signed-off-by: Wenlin Kang Signed-off-by: Martin Jansa --- ...tmultimedia-fix-a-conflicting-declaration.patch | 103 +++++++++++++++++++++ recipes-qt/qt5/qtmultimedia_git.bb | 1 + 2 files changed, 104 insertions(+) create mode 100644 recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch new file mode 100644 index 00000000..8547f72a --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -0,0 +1,103 @@ +From 849355a1c59d76fa39dc93b537458a084190fa45 Mon Sep 17 00:00:00 2001 +From: Wenlin Kang +Date: Thu, 8 Sep 2016 12:18:13 +0800 +Subject: [PATCH] qtmultimedia: fix a conflicting declaration + +Use lgl2.h instead of gl2.h and gl2ext.h, +fix a "conflicting declaration" error. + +Signed-off-by: Wenlin Kang +--- + src/plugins/videonode/imx6/lgl2.h | 46 ++++++++++++++++++++++ + .../videonode/imx6/qsgvivantevideomaterial.cpp | 5 ++- + src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 5 ++- + 3 files changed, 52 insertions(+), 4 deletions(-) + create mode 100644 src/plugins/videonode/imx6/lgl2.h + +diff --git a/src/plugins/videonode/imx6/lgl2.h b/src/plugins/videonode/imx6/lgl2.h +new file mode 100644 +index 0000000..2423697 +--- /dev/null ++++ b/src/plugins/videonode/imx6/lgl2.h +@@ -0,0 +1,46 @@ ++#ifndef __L_GL2_H__ ++#define __L_GL2_H__ ++ ++// this file comes from and , ++// it's a light gl2.h. ++ ++/*------------------------------------------------------------------------- ++ * Definition of KHRONOS_APIENTRY ++ *------------------------------------------------------------------------- ++ * This follows the return type of the function and precedes the function ++ * name in the function prototype. ++ */ ++#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) ++ /* Win32 but not WinCE */ ++# define KHRONOS_APIENTRY __stdcall ++#else ++# define KHRONOS_APIENTRY ++#endif ++ ++#ifndef GL_APIENTRY ++# define GL_APIENTRY KHRONOS_APIENTRY ++#endif ++ ++#ifndef GL_APIENTRYP ++# define GL_APIENTRYP GL_APIENTRY* ++#endif ++ ++typedef void GLvoid; ++typedef unsigned int GLenum; ++typedef unsigned int GLuint; ++typedef int GLsizei; ++ ++#define GL_VIV_YV12 0x8FC0 ++#define GL_VIV_NV12 0x8FC1 ++#define GL_VIV_YUY2 0x8FC2 ++#define GL_VIV_UYVY 0x8FC3 ++#define GL_VIV_NV21 0x8FC4 ++#define GL_VIV_I420 0x8FC5 ++ ++typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVMAPPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); ++typedef void (GL_APIENTRYP PFNGLTEXDIRECTMAPVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); ++typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Pixels); ++typedef void (GL_APIENTRYP PFNGLTEXDIRECTINVALIDATEVIVPROC) (GLenum Target); ++typedef void (GL_APIENTRYP PFNGLTEXDIRECTTILEDMAPVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); ++ ++#endif +diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp +index 2e2092b..54568db 100644 +--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp ++++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp +@@ -31,8 +31,9 @@ + ** + ****************************************************************************/ + +-#include +-#include ++// use lgl2.h instead of and , ++// fixes a conflicting declaration issue. ++#include "lgl2.h" + + #include "qsgvivantevideomaterial.h" + #include "qsgvivantevideomaterialshader.h" +diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +index 229a69b..184fd12 100644 +--- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp ++++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp +@@ -31,8 +31,9 @@ + ** + ****************************************************************************/ + +-#include +-#include ++// use lgl2.h instead of and , ++// fixes a conflicting declaration issue. ++#include "lgl2.h" + + #include "qsgvivantevideonode.h" + #include "qsgvivantevideomaterialshader.h" +-- +1.9.1 + diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 3bbfb6e0..245f1063 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -36,6 +36,7 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gst SRC_URI += "\ file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ + file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " SRCREV = "1be4f74843b41f8bc1d1d64e83485f4eb864e8b4" -- cgit v1.2.3 From 047ebac2300cae4409dca03467c8aee740939da5 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 21 Sep 2016 15:31:38 -0300 Subject: qtwebengine: Add gperf-native to DEPENDS Fix error: FAILED: cd ../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-gnueabi/qtwebengine/ 5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/src/3rdparty/chromium/ third_party/WebKit/Source/platform; gperf "--key-positions=*" -D -s 2 ColorData.gperf "--output-file=../build/tmp/work/cortexa9hf-neon-mx6qdl-linux- gnueabi/qtwebengine/5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/ src/core/Release/gen/blink/platform/ColorData.cpp" /bin/sh: gperf: command not found ninja: build stopped: subcommand failedP Change-Id: Ic28d0ac72fcbce8054638a3168b5d6a34bc129b5 Signed-off-by: Fabio Berton Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aedd1417..92d93628 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -19,6 +19,7 @@ DEPENDS += " \ qtlocation \ libdrm fontconfig pixman openssl pango cairo icu pciutils \ libcap \ + gperf-native \ " # when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES), -- cgit v1.2.3 From 6255c3bc0ccf1b4329d9a460fa853be0d7827224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Tue, 18 Oct 2016 15:40:52 -0400 Subject: qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland. Signed-off-by: Vesa Jääskeläinen Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 +++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index a214346a..1149aa5b 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -18,6 +18,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " do_configure() { diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch new file mode 100644 index 00000000..d173e673 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch @@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= +Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are + disabled. + +QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, +QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account when compiling +QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include + + #include ++#ifndef QT_NO_ACCESSIBILITY + #include ++#endif + #include + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay)) + : mInputContext.reset(QPlatformInputContextFactory::create(icStr)); +@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag; ++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const + return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const + return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() const + { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h +index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility; ++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index b208961c..e315924c 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -46,6 +46,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" -- cgit v1.2.3 From df324ebd497db3ab935a79ddc5a378b14a6ea91f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 8 Oct 2016 16:11:02 +0200 Subject: qt5: Use existing variables for paths of host tools Makes it possible to install qmake into ${bindir} without setting QT_DIR_NAME = "". Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 2 +- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt5-creator_3.5.1.bb | 6 +++--- recipes-qt/qt5/qtbase_git.bb | 4 ++-- recipes-qt/qt5/qtdeclarative_git.bb | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index a4b7d1bf..70faccaa 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -32,7 +32,7 @@ EXTRA_OEMAKE = " \ 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_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake" OE_QMAKE_COMPILER = "${CC}" OE_QMAKE_CC = "${CC}" OE_QMAKE_CFLAGS = "${CFLAGS}" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 74526484..dce78fce 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -146,7 +146,7 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location -OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" +OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}" OE_QMAKE_QMAKE = "bin/qmake" do_configure() { diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb index 2d8cee9d..f4ba8580 100644 --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb @@ -32,8 +32,8 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" do_configure_append() { # Find native tools - sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile - sed -i 's:${STAGING_BINDIR}.*/qdoc:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qdoc:g' ${B}/Makefile + sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile # see qtbase-native.inc # sed -i 's:QT_INSTALL_DOCS=${docdir}:QT_INSTALL_DOCS=${STAGING_DATADIR_NATIVE}${QT_DIR_NAME}/doc:g' ${B}/Makefile @@ -50,7 +50,7 @@ do_install() { # install desktop and ensure that qt-creator finds qmake install -d ${D}${datadir}/applications install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop - sed -i 's:@QT5_QMAKE@:${bindir}${QT_DIR_NAME}:g' ${D}${datadir}/applications/qtcreator.desktop + sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop } FILES_${PN} += " \ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index eda57aca..223383dd 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -156,7 +156,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 = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" +OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_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 @@ -211,7 +211,7 @@ do_install_append() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri - install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake + install -m 0755 ${B}/bin/qmake-target ${D}${OE_QMAKE_PATH_QT_BINS}/qmake # Remove example.pro file as it is useless rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 5cc4caa1..2633be7e 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -22,7 +22,7 @@ SRC_URI += " \ file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \ " -EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" +EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt" PACKAGECONFIG ??= "qtxmlpatterns" PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" @@ -33,7 +33,7 @@ do_configure_prepend() { sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro #set the path for syncqt properly - echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache + echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache } EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -- cgit v1.2.3 From 81fb771c3f31110e50eebcb004809361fdb28194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Sat, 29 Oct 2016 16:24:55 +0300 Subject: Update Qt5's git repositories to match new locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt5's repositories in github has changed locations. Qt5 itself and most of its modules are now under: github.com/qt Where as qt5-everywhere-demo is under: github.com/qt-labs Signed-off-by: Vesa Jääskeläinen Signed-off-by: Martin Jansa --- conf/layer.conf | 3 ++- recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 73ce00a6..7eb3b2db 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -33,5 +33,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -QT_GIT ?= "git://github.com/qtproject" +QT_GIT ?= "git://github.com/qt" +QT_LABS_GIT ?= "git://github.com/qt-labs" QT_GIT_PROTOCOL ?= "git" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index ab2bbd4a..7735d902 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b" DEPENDS = "qtdeclarative qtgraphicaleffects" SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" -SRC_URI = "${QT_GIT}/qt-labs-qt5-everywhere-demo" +SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" -- cgit v1.2.3