diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | |
parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
download | meta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name so that it's more
clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch new file mode 100644 index 00000000..b2e017eb --- /dev/null +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cody P Schafer <dev@codyps.com> | ||
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | ||
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | ||
5 | lupdate and lrelease | ||
6 | |||
7 | --- | ||
8 | src/linguist/Qt5LinguistToolsConfig.cmake.in | 15 +++------------ | ||
9 | 1 file changed, 3 insertions(+), 12 deletions(-) | ||
10 | |||
11 | diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in | ||
12 | index 4318b16f..2e3b70fa 100644 | ||
13 | --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in | ||
14 | +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in | ||
15 | @@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ | ||
16 | !!ELSE | ||
17 | set(_qt5_linguisttools_install_prefix \"$$[QT_INSTALL_PREFIX]\") | ||
18 | !!ENDIF | ||
19 | +if (OE_QMAKE_PATH_HOST_PREFIX) | ||
20 | + set(_qt5_linguisttools_install_prefix \"${OE_QMAKE_PATH_HOST_PREFIX}\") | ||
21 | +endif() | ||
22 | |||
23 | macro(_qt5_LinguistTools_check_file_exists file) | ||
24 | if(NOT EXISTS \"${file}\" ) | ||
25 | @@ -44,11 +47,7 @@ endmacro() | ||
26 | if (NOT TARGET Qt5::lrelease) | ||
27 | add_executable(Qt5::lrelease IMPORTED) | ||
28 | |||
29 | -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
30 | set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") | ||
31 | -!!ELSE | ||
32 | - set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") | ||
33 | -!!ENDIF | ||
34 | _qt5_LinguistTools_check_file_exists(${imported_location}) | ||
35 | |||
36 | set_target_properties(Qt5::lrelease PROPERTIES | ||
37 | @@ -59,11 +58,7 @@ endif() | ||
38 | if (NOT TARGET Qt5::lupdate) | ||
39 | add_executable(Qt5::lupdate IMPORTED) | ||
40 | |||
41 | -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
42 | set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") | ||
43 | -!!ELSE | ||
44 | - set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") | ||
45 | -!!ENDIF | ||
46 | _qt5_LinguistTools_check_file_exists(${imported_location}) | ||
47 | |||
48 | set_target_properties(Qt5::lupdate PROPERTIES | ||
49 | @@ -74,11 +69,7 @@ endif() | ||
50 | if (NOT TARGET Qt5::lconvert) | ||
51 | add_executable(Qt5::lconvert IMPORTED) | ||
52 | |||
53 | -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
54 | set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") | ||
55 | -!!ELSE | ||
56 | - set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") | ||
57 | -!!ENDIF | ||
58 | _qt5_LinguistTools_check_file_exists(${imported_location}) | ||
59 | |||
60 | set_target_properties(Qt5::lconvert PROPERTIES | ||