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

(From meta-qt5 rev: 5d5ba83cc6eadbff6d60d5ae4947bc9b48d846f4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/classes/qmake5.bbclass b/meta-qt5/classes/qmake5.bbclass
index 180cedc..00d6c0e 100644 (file)
--- a/meta-qt5/classes/qmake5.bbclass
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc
index e9b87a0..97f3ee1 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qt5-native.inc b/meta-qt5/recipes-qt/qt5/qtbase-native.inc
similarity index 93%
rename from meta-qt5/recipes-qt/qt5/qt5-native.inc
rename to meta-qt5/recipes-qt/qt5/qtbase-native.inc
index 1aa5c0c..db1292c 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-native.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/meta-qt5/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
similarity index 100%
rename from meta-qt5/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
rename to meta-qt5/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch

diff --git a/meta-qt5/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/meta-qt5/recipes-qt/qt5/qtbase-native_5.0.0+git.bb
similarity index 84%
rename from meta-qt5/recipes-qt/qt5/qt5-native_5.0.0+git.bb
rename to meta-qt5/recipes-qt/qt5/qtbase-native_5.0.0+git.bb
index e99971f..80d8056 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-native_5.0.0+git.bb
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qt5-native_5.0.1.bb b/meta-qt5/recipes-qt/qt5/qtbase-native_5.0.1.bb
similarity index 80%
rename from meta-qt5/recipes-qt/qt5/qt5-native_5.0.1.bb
rename to meta-qt5/recipes-qt/qt5/qtbase-native_5.0.1.bb
index f822a3e..f5d9613 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-native_5.0.1.bb
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index 2b14de1..f420d37 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch b/meta-qt5/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
similarity index 100%
rename from meta-qt5/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
rename to meta-qt5/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch

diff --git a/meta-qt5/recipes-qt/qt5/qtjsbackend-native.inc b/meta-qt5/recipes-qt/qt5/qtjsbackend-native.inc
index 8a66229..37e2b80 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtjsbackend-native.inc
+++ b/meta-qt5/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"