From 48f01e2c5d3b9599550a327bd91c662e80cac76f Mon Sep 17 00:00:00 2001
From: Philippe Schenker <philippe.schenker@toradex.com>
Date: Tue, 14 Jul 2020 19:49:24 +0200
Subject: falkon: move recipe so it does not interfere with meta-qt5

Related-to: ELB-2838
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
 meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb | 28 ++++++++++++++++++++++++
 qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb      | 28 ------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb
 delete mode 100644 qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb

diff --git a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb
new file mode 100644
index 0000000..4e2627d
--- /dev/null
+++ b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Falkon Webbrowser"
+HOMEPAGE = "http://www.falkon.org"
+SECTION = "x11"
+
+LICENSE = "GPLv3 & LGPLv3 & MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+
+DEPENDS  = "libxcb ki18n openssl qtbase qttools-native qtwebengine qtx11extras"
+
+inherit cmake_qt5_extra gettext kde-base
+
+SRC_URI = "https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz"
+SRC_URI[md5sum] = "9255fb335d3ba361dea44b7b297ddf7d"
+SRC_URI[sha256sum] = "ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587"
+
+PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+
+export USE_LIBPATH = "${libdir}"
+export QUPZILLA_PREFIX = "${prefix}"
+export SHARE_FOLDER = "${datadir}"
+export QMAKE_LRELEASE = "${RECIPE_SYSROOT_NATIVE}/usr/bin/qt5"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_DATA}/icons \
+    ${OE_QMAKE_PATH_DATA}/metainfo \
+    ${OE_QMAKE_PATH_DATA}/bash-completion/completions \
+    ${OE_QMAKE_PATH_PLUGINS}/falkon \
+"
diff --git a/qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb b/qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb
deleted file mode 100644
index 4e2627d..0000000
--- a/qt5-layer/recipes-qt/falkon/falkon_3.1.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Falkon Webbrowser"
-HOMEPAGE = "http://www.falkon.org"
-SECTION = "x11"
-
-LICENSE = "GPLv3 & LGPLv3 & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
-
-DEPENDS  = "libxcb ki18n openssl qtbase qttools-native qtwebengine qtx11extras"
-
-inherit cmake_qt5_extra gettext kde-base
-
-SRC_URI = "https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz"
-SRC_URI[md5sum] = "9255fb335d3ba361dea44b7b297ddf7d"
-SRC_URI[sha256sum] = "ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
-
-export USE_LIBPATH = "${libdir}"
-export QUPZILLA_PREFIX = "${prefix}"
-export SHARE_FOLDER = "${datadir}"
-export QMAKE_LRELEASE = "${RECIPE_SYSROOT_NATIVE}/usr/bin/qt5"
-
-FILES_${PN} += " \
-    ${OE_QMAKE_PATH_DATA}/icons \
-    ${OE_QMAKE_PATH_DATA}/metainfo \
-    ${OE_QMAKE_PATH_DATA}/bash-completion/completions \
-    ${OE_QMAKE_PATH_PLUGINS}/falkon \
-"
-- 
cgit v1.2.3