aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-27 16:43:59 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2013-01-01 20:32:34 +0100
commit9f04cb7bb6f9753e32988127038b648afbd9b974 (patch)
treec5bcd517f4d2b19d00d22c15aaaf64a9249fd851
parent319a61802d4d5fb971693f3df1e69450e7bbab8a (diff)
qt5: move module specific files to own directories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qt5-native.inc2
-rw-r--r--recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch (renamed from recipes-qt/qt5/qtbase/0001-Always-build-uic.patch)0
-rw-r--r--recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch (renamed from recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch)0
-rw-r--r--recipes-qt/qt5/qtbase/qmake.conf.sh (renamed from recipes-qt/qt5/files/qmake.conf.sh)0
-rw-r--r--recipes-qt/qt5/qtbase/qplatformdefs.h (renamed from recipes-qt/qt5/files/qplatformdefs.h)0
5 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 11cfcff0..392508fa 100644
--- a/recipes-qt/qt5/qt5-native.inc
+++ b/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/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
index 3f2e3fd9..3f2e3fd9 100644
--- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
+++ b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
index 6c9affae..6c9affae 100644
--- a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
+++ b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
diff --git a/recipes-qt/qt5/files/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh
index 52682396..52682396 100644
--- a/recipes-qt/qt5/files/qmake.conf.sh
+++ b/recipes-qt/qt5/qtbase/qmake.conf.sh
diff --git a/recipes-qt/qt5/files/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h
index 5d22fb41..5d22fb41 100644
--- a/recipes-qt/qt5/files/qplatformdefs.h
+++ b/recipes-qt/qt5/qtbase/qplatformdefs.h