diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-14 15:06:28 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:10:47 +0300 |
| commit | 63dec9bbd826a4afafa7177aaa3439467f25d80a (patch) | |
| tree | afcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtremoteobjects | |
| parent | 79791026ff20539180027de0d796f8acd55bc7bf (diff) | |
| parent | 53500ade778bac6e1733db43fc41c290d7b9d16b (diff) | |
| download | meta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz | |
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master:
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
qtconnectivity,qtsystems: Account for bluez4 from oe-core
gdb_%.bbappend: Avoid PAK archive (application/x-pak)
Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtremoteobjects')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch new file mode 100644 index 00000000..caf08de4 --- /dev/null +++ b/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | From 30d1467553f75ba94baa4569c0222c5d407f275c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: ibinderwolf <daniel@bluepattern.net> | ||
| 3 | Date: Wed, 26 Jun 2019 09:46:48 +0200 | ||
| 4 | Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS | ||
| 5 | |||
| 6 | --- | ||
| 7 | src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | 2 +- | ||
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 9 | |||
| 10 | diff --git a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | ||
| 11 | index 4907ded..34729da 100644 | ||
| 12 | --- a/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | ||
| 13 | +++ b/src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | ||
| 14 | @@ -40,7 +40,7 @@ if (NOT TARGET Qt5::repc) | ||
| 15 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
| 16 | set(imported_location \"${_qt5RemoteObjects_install_prefix}/$${CMAKE_BIN_DIR}repc$$CMAKE_BIN_SUFFIX\") | ||
| 17 | !!ELSE | ||
| 18 | - set(imported_location \"$${CMAKE_BIN_DIR}repc$$CMAKE_BIN_SUFFIX\") | ||
| 19 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/repc${OE_QMAKE_BIN_SUFFIX}\") | ||
| 20 | !!ENDIF | ||
| 21 | _qt5_RemoteObjects_check_file_exists(${imported_location}) | ||
| 22 | |||
