diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-10-13 13:31:34 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-30 14:15:41 +0100 |
| commit | ca640377e57da285ea3572096a155ea06fe39e95 (patch) | |
| tree | 5e3c0a5b87f3d9fbecac8057c79ce47befbcfa3d /recipes-qt/qt5/qtbase | |
| parent | 264f20883cae2c5e5222538b3f76e2145e72b1ab (diff) | |
qtbase: fix path to external hostbindir binaries
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 7 |
1 files changed, 3 insertions, 4 deletions
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 d5df4f69..01d1e454 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 |