From 492109ad37c63627ab833c6bf555b20ec1710d60 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Dec 2012 16:43:59 +0100 Subject: [PATCH] qt5: move module specific files to own directories (From meta-qt5 rev: 9f04cb7bb6f9753e32988127038b648afbd9b974) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qt5-native.inc | 2 +- .../recipes-qt/qt5/{qtbase => qt5-native}/0001-Always-build-uic.patch | 0 .../0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch | 0 meta-qt5/recipes-qt/qt5/{files => qtbase}/qmake.conf.sh | 0 meta-qt5/recipes-qt/qt5/{files => qtbase}/qplatformdefs.h | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename meta-qt5/recipes-qt/qt5/{qtbase => qt5-native}/0001-Always-build-uic.patch (100%) rename meta-qt5/recipes-qt/qt5/{qtbase => qt5-native}/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch (100%) rename meta-qt5/recipes-qt/qt5/{files => qtbase}/qmake.conf.sh (100%) rename meta-qt5/recipes-qt/qt5/{files => qtbase}/qplatformdefs.h (100%) diff --git a/meta-qt5/recipes-qt/qt5/qt5-native.inc b/meta-qt5/recipes-qt/qt5/qt5-native.inc index 11cfcff..392508f 100644 --- a/meta-qt5/recipes-qt/qt5/qt5-native.inc +++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/meta-qt5/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch similarity index 100% rename from meta-qt5/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch rename to meta-qt5/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch diff --git a/meta-qt5/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/meta-qt5/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch similarity index 100% rename from meta-qt5/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch rename to meta-qt5/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch diff --git a/meta-qt5/recipes-qt/qt5/files/qmake.conf.sh b/meta-qt5/recipes-qt/qt5/qtbase/qmake.conf.sh similarity index 100% rename from meta-qt5/recipes-qt/qt5/files/qmake.conf.sh rename to meta-qt5/recipes-qt/qt5/qtbase/qmake.conf.sh diff --git a/meta-qt5/recipes-qt/qt5/files/qplatformdefs.h b/meta-qt5/recipes-qt/qt5/qtbase/qplatformdefs.h similarity index 100% rename from meta-qt5/recipes-qt/qt5/files/qplatformdefs.h rename to meta-qt5/recipes-qt/qt5/qtbase/qplatformdefs.h -- 2.7.4