diff options
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | 7 | ||||
| -rw-r--r-- | 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 87359429..7c54008b 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 | |||
| 149 | index d6861cf..7fb58a3 100644 | 149 | index d6861cf..7fb58a3 100644 |
| 150 | --- a/qtbase.pro | 150 | --- a/qtbase.pro |
| 151 | +++ b/qtbase.pro | 151 | +++ b/qtbase.pro |
| 152 | @@ -69,18 +69,26 @@ CONFIG -= qt | 152 | @@ -69,18 +69,25 @@ CONFIG -= qt |
| 153 | 153 | ||
| 154 | ### installations #### | 154 | ### installations #### |
| 155 | 155 | ||
| @@ -159,7 +159,7 @@ index d6861cf..7fb58a3 100644 | |||
| 159 | qmake.path = $$[QT_HOST_BINS] | 159 | qmake.path = $$[QT_HOST_BINS] |
| 160 | +qmake.files = $$OUT_PWD/bin/qmake | 160 | +qmake.files = $$OUT_PWD/bin/qmake |
| 161 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 161 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
| 162 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake | 162 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake |
| 163 | +} | 163 | +} |
| 164 | equals(QMAKE_HOST.os, Windows) { | 164 | equals(QMAKE_HOST.os, Windows) { |
| 165 | - qmake.files = $$OUT_PWD/bin/qmake.exe | 165 | - qmake.files = $$OUT_PWD/bin/qmake.exe |
| @@ -172,9 +172,8 @@ index d6861cf..7fb58a3 100644 | |||
| 172 | #syncqt | 172 | #syncqt |
| 173 | syncqt.path = $$[QT_HOST_BINS] | 173 | syncqt.path = $$[QT_HOST_BINS] |
| 174 | syncqt.files = $$PWD/bin/syncqt.pl | 174 | syncqt.files = $$PWD/bin/syncqt.pl |
| 175 | +syncqt.files = $$PWD/bin/syncqt.pl | ||
| 176 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 175 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
| 177 | + syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl | 176 | + syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl |
| 178 | +} | 177 | +} |
| 179 | INSTALLS += syncqt | 178 | INSTALLS += syncqt |
| 180 | 179 | ||
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 | |||
| 149 | index d6861cf..7fb58a3 100644 | 149 | index d6861cf..7fb58a3 100644 |
| 150 | --- a/qtbase.pro | 150 | --- a/qtbase.pro |
| 151 | +++ b/qtbase.pro | 151 | +++ b/qtbase.pro |
| 152 | @@ -69,18 +69,26 @@ CONFIG -= qt | 152 | @@ -69,18 +69,25 @@ CONFIG -= qt |
| 153 | 153 | ||
| 154 | ### installations #### | 154 | ### installations #### |
| 155 | 155 | ||
| @@ -159,7 +159,7 @@ index d6861cf..7fb58a3 100644 | |||
| 159 | qmake.path = $$[QT_HOST_BINS] | 159 | qmake.path = $$[QT_HOST_BINS] |
| 160 | +qmake.files = $$OUT_PWD/bin/qmake | 160 | +qmake.files = $$OUT_PWD/bin/qmake |
| 161 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 161 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
| 162 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake | 162 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake |
| 163 | +} | 163 | +} |
| 164 | equals(QMAKE_HOST.os, Windows) { | 164 | equals(QMAKE_HOST.os, Windows) { |
| 165 | - qmake.files = $$OUT_PWD/bin/qmake.exe | 165 | - qmake.files = $$OUT_PWD/bin/qmake.exe |
| @@ -172,9 +172,8 @@ index d6861cf..7fb58a3 100644 | |||
| 172 | #syncqt | 172 | #syncqt |
| 173 | syncqt.path = $$[QT_HOST_BINS] | 173 | syncqt.path = $$[QT_HOST_BINS] |
| 174 | syncqt.files = $$PWD/bin/syncqt.pl | 174 | syncqt.files = $$PWD/bin/syncqt.pl |
| 175 | +syncqt.files = $$PWD/bin/syncqt.pl | ||
| 176 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 175 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
| 177 | + syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl | 176 | + syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/syncqt.pl |
| 178 | +} | 177 | +} |
| 179 | INSTALLS += syncqt | 178 | INSTALLS += syncqt |
| 180 | 179 | ||