← Back to branch summary

~timo-jyrinki/kubuntu-packaging/qtchooser_qmlscene_fallback

« back to all changes in this revision

Viewing changes to debian/patches/add_qdoc_and_qdoc3.patch

  • Committer: Timo Jyrinki
  • Date: 2013-02-06 12:48:31 UTC
  • Revision ID: timo.jyrinki@canonical.com-20130206124831-fb15xqrz1egh2ik4
Add qdoc patch, document the other patch, add qt4-qmlviewer conflict

* Proposed upstream patch:
  - create-a-system-default-path.patch
* Merged upstream patch:
  - add_qdoc_and_qdoc3.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add_qdoc_and_qdoc3.patch
 
1
From e7fb861749bfa8e6b26eb059c5eed157f2cdf2c0 Mon Sep 17 00:00:00 2001
 
2
From: Timo Jyrinki <timo.jyrinki@canonical.com>
 
3
Date: Mon, 4 Feb 2013 11:01:00 +0200
 
4
Subject: [PATCH] Add qdoc and qdoc3
 
5
 
 
6
Make qtchooser handle also qdoc and qdoc3, expected to be found
 
7
similar to other tools by developers.
 
8
 
 
9
Change-Id: Ie6bfb1d85fbdcb1919f107e97557ccc848f334cd
 
10
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 
11
---
 
12
 Makefile |    2 ++
 
13
 1 files changed, 2 insertions(+), 0 deletions(-)
 
14
 
 
15
diff --git a/Makefile b/Makefile
 
16
index 1b93597..6be98a6 100644
 
17
--- a/Makefile
 
18
+++ b/Makefile
 
19
@@ -13,6 +13,8 @@ TOOLS = assistant \
 
20
        qdbuscpp2xml \
 
21
        qdbusviewer \
 
22
        qdbusxml2cpp \
 
23
+       qdoc \
 
24
+       qdoc3 \
 
25
        qglinfo \
 
26
        qhelpconverter \
 
27
        qhelpgenerator \
 
28
-- 
 
29
1.7.1
 
30