diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
| commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
| tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |
| parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
| download | meta-qt5-81156172a83da2210e9af290f95f45fd194c84a2.tar.gz | |
qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch new file mode 100644 index 00000000..14cb8aa4 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 24 Sep 2018 02:11:10 -0700 | ||
| 4 | Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths | ||
| 5 | |||
| 6 | If we do not use this define,then it falls into else case which | ||
| 7 | generated .pri files with /usr/include and so on for includes and | ||
| 8 | compiler does not like specifying absolute include paths pointing to | ||
| 9 | build host includes | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Source/WebKit/PlatformQt.cmake | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake | ||
| 17 | index 9aed9906e..48638aef4 100644 | ||
| 18 | --- a/Source/WebKit/PlatformQt.cmake | ||
| 19 | +++ b/Source/WebKit/PlatformQt.cmake | ||
| 20 | @@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) | ||
| 21 | install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) | ||
| 22 | endif () | ||
| 23 | |||
| 24 | -if (KDE_INSTALL_USE_QT_SYS_PATHS) | ||
| 25 | +if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE) | ||
| 26 | set(WebKit_PRI_ARGUMENTS | ||
| 27 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" | ||
| 28 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" | ||
| 29 | @@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) | ||
| 30 | install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) | ||
| 31 | endif () | ||
| 32 | |||
| 33 | -if (KDE_INSTALL_USE_QT_SYS_PATHS) | ||
| 34 | +if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE) | ||
| 35 | set(WebKitWidgets_PRI_ARGUMENTS | ||
| 36 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" | ||
| 37 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" | ||
