summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qttools-git')
-rw-r--r--recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch4
-rw-r--r--recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch4
-rw-r--r--recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch8
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index e4ad2210..ec58a115 100644
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
1From ff3f521648906d07ddc1e1aecaddadb95b0314f3 Mon Sep 17 00:00:00 2001 1From 4d4794880eecd27b006b4d00f44c611162d24538 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644
151 installed_cmake.depends = cmake 151 installed_cmake.depends = cmake
152 152
153-- 153--
1542.1.3 1542.3.1
155 155
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 5cc317ce..f473041c 100644
--- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,4 +1,4 @@
1From 20dd8d70eb3db17173eb3965e757711cc694de2a Mon Sep 17 00:00:00 2001 1From d6fd9b34cd507b054e20c61aaf8bee4bf800abb1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30-- 30--
312.1.3 312.3.1
32 32
diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
index bf5957bc..6eb4d840 100644
--- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001 1From 9868ff8a11f36712f9bc2fe45ad129214994947a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/3] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -16,7 +16,7 @@ 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
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index 5f96377..71acdfc 100644 19index 6e82b07..56df78c 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 @@
@@ -25,7 +25,7 @@ index 5f96377..71acdfc 100644
25 QT += webkitwidgets 25 QT += webkitwidgets
26 } else { 26 } else {
27 DEFINES += QT_NO_WEBKIT 27 DEFINES += QT_NO_WEBKIT
28@@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ 28@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \
29 openpageswidget.cpp \ 29 openpageswidget.cpp \
30 openpagesmanager.cpp \ 30 openpagesmanager.cpp \
31 openpagesswitcher.cpp 31 openpagesswitcher.cpp
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.1.3 502.3.1
51 51