From b6e67a51e8eae11773b2d901fdf3e4da11070ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 7 May 2015 18:28:41 +0200
Subject: [PATCH] greenisland: use hawaii.bbclass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-hawaii/greenisland/greenisland_git.bb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/recipes-hawaii/greenisland/greenisland_git.bb b/recipes-hawaii/greenisland/greenisland_git.bb
index 555d1cef..2e87bf5b 100644
--- a/recipes-hawaii/greenisland/greenisland_git.bb
+++ b/recipes-hawaii/greenisland/greenisland_git.bb
@@ -2,13 +2,10 @@ SUMMARY = "Support library to make Qt-based Wayland compositors development easi
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
 
-inherit cmake_qt5 cmake-lib pythonnative pkgconfig
+inherit hawaii cmake-lib pythonnative pkgconfig
 
-DEPENDS = " \
+DEPENDS += " \
     ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
-    extra-cmake-modules-native \
-    qtbase \
-    qtdeclarative \
     wayland \
     qtwayland \
     libkscreen \
@@ -33,11 +30,11 @@ CMAKE_ALIGN_SYSROOT[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
-    ${libdir}/qml/GreenIsland \
+    ${OE_QMAKE_PATH_QML}/GreenIsland \
     ${libdir}/plugins/greenisland \
 "
 FILES_${PN}-dbg += " \
-    ${libdir}/qml/GreenIsland/.debug \
+    ${OE_QMAKE_PATH_QML}/GreenIsland/.debug \
     ${libdir}/plugins/greenisland/.debug \
 "
 FILES_${PN}-dev += "${libdir}/cmake"