t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-06 14:14:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: fix path to external hostbindir binaries

Browse Source 
This fixes syncqt.pl not being included in qtbase-tools.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Jonathan Liu
2014-10-13 13:31:34 +11:00
committed by Martin Jansa
parent 264f20883c
commit ca640377e5
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
View File

@@ -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

7
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
View File

@@ -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