[oe] [meta-qt5][PATCH] qtbase: fix path to external hostbindir binaries
Jonathan Liu
net147 at gmail.com
Mon Oct 13 02:31:34 UTC 2014
This fixes syncqt.pl not being included in qtbase-tools.
Signed-off-by: Jonathan Liu <net147 at gmail.com>
---
.../qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | 7 +++----
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 88bb484..8723b79 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -149,7 +149,7 @@ diff --git a/qtbase.pro b/qtbase.pro
index d6861cf..7fb58a3 100644
--- a/qtbase.pro
+++ b/qtbase.pro
-@@ -69,18 +69,26 @@ CONFIG -= qt
+@@ -69,18 +69,25 @@ CONFIG -= qt
### installations ####
@@ -159,7 +159,7 @@ index d6861cf..7fb58a3 100644
qmake.path = $$[QT_HOST_BINS]
+qmake.files = $$OUT_PWD/bin/qmake
+!isEmpty(QT_EXTERNAL_HOST_BINS) {
-+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake
+}
equals(QMAKE_HOST.os, Windows) {
- qmake.files = $$OUT_PWD/bin/qmake.exe
@@ -172,9 +172,8 @@ index d6861cf..7fb58a3 100644
#syncqt
syncqt.path = $$[QT_HOST_BINS]
syncqt.files = $$PWD/bin/syncqt.pl
-+syncqt.files = $$PWD/bin/syncqt.pl
+!isEmpty(QT_EXTERNAL_HOST_BINS) {
-+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl
+}
INSTALLS += syncqt
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index d5df4f6..01d1e45 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -149,7 +149,7 @@ diff --git a/qtbase.pro b/qtbase.pro
index d6861cf..7fb58a3 100644
--- a/qtbase.pro
+++ b/qtbase.pro
-@@ -69,18 +69,26 @@ CONFIG -= qt
+@@ -69,18 +69,25 @@ CONFIG -= qt
### installations ####
@@ -159,7 +159,7 @@ index d6861cf..7fb58a3 100644
qmake.path = $$[QT_HOST_BINS]
+qmake.files = $$OUT_PWD/bin/qmake
+!isEmpty(QT_EXTERNAL_HOST_BINS) {
-+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake
+}
equals(QMAKE_HOST.os, Windows) {
- qmake.files = $$OUT_PWD/bin/qmake.exe
@@ -172,9 +172,8 @@ index d6861cf..7fb58a3 100644
#syncqt
syncqt.path = $$[QT_HOST_BINS]
syncqt.files = $$PWD/bin/syncqt.pl
-+syncqt.files = $$PWD/bin/syncqt.pl
+!isEmpty(QT_EXTERNAL_HOST_BINS) {
-+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl
+}
INSTALLS += syncqt
--
2.1.2
More information about the Openembedded-devel
mailing list