diff options
Diffstat (limited to 'recipes-qt/qt5/qttools')
-rw-r--r-- | recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch (renamed from recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch) | 14 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch (renamed from recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch) | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 88c39c74..ed25390b 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001 | 1 | From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | 16 | 2 files changed, 3 insertions(+), 3 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro | 18 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro |
19 | index ef5c595..9c2dc1c 100644 | 19 | index 540c9689..2312b521 100644 |
20 | --- a/src/assistant/assistant/assistant.pro | 20 | --- a/src/assistant/assistant/assistant.pro |
21 | +++ b/src/assistant/assistant/assistant.pro | 21 | +++ b/src/assistant/assistant/assistant.pro |
22 | @@ -1,4 +1,4 @@ | 22 | @@ -1,4 +1,4 @@ |
23 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | 23 | -false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { |
24 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { | 24 | +false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { |
25 | # FIXME: currently broken | ||
25 | BROWSER = qtwebkit | 26 | BROWSER = qtwebkit |
26 | } else { | 27 | } else { |
27 | BROWSER = qtextbrowser | 28 | @@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ |
28 | @@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ | ||
29 | openpagesmanager.cpp \ | 29 | openpagesmanager.cpp \ |
30 | openpagesswitcher.cpp | 30 | openpagesswitcher.cpp |
31 | 31 | ||
@@ -35,7 +35,7 @@ index ef5c595..9c2dc1c 100644 | |||
35 | QT += webkitwidgets | 35 | QT += webkitwidgets |
36 | SOURCES += helpviewer_qwv.cpp | 36 | SOURCES += helpviewer_qwv.cpp |
37 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro | 37 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro |
38 | index 500a153..b60fa2d 100644 | 38 | index 500a1534..b60fa2d9 100644 |
39 | --- a/src/designer/src/plugins/plugins.pro | 39 | --- a/src/designer/src/plugins/plugins.pro |
40 | +++ b/src/designer/src/plugins/plugins.pro | 40 | +++ b/src/designer/src/plugins/plugins.pro |
41 | @@ -1,6 +1,6 @@ | 41 | @@ -1,6 +1,6 @@ |
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index 1a201de9..b2e017eb 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001 | 1 | From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for |
@@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for | |||
9 | 1 file changed, 3 insertions(+), 12 deletions(-) | 9 | 1 file changed, 3 insertions(+), 12 deletions(-) |
10 | 10 | ||
11 | diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in | 11 | diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in |
12 | index 4318b16..2e3b70f 100644 | 12 | index 4318b16f..2e3b70fa 100644 |
13 | --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in | 13 | --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in |
14 | +++ b/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_ | 15 | @@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ |