diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-03-28 13:55:57 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-03-29 05:32:50 -0500 |
| commit | 1bc3049c34b2190b6d14c5c29d70fa87ed8946ab (patch) | |
| tree | b5a5354107a26412213957be75d4ffa952373136 | |
| parent | c3698ea3e965cea74c039b8f8e4c968829f01dc0 (diff) | |
No need for extra patch, it's covered in 0053
| -rw-r--r-- | patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch | 11 | ||||
| -rw-r--r-- | patches/0108-No-qdoc3-in-qttools.patch | 25 |
2 files changed, 1 insertions, 35 deletions
diff --git a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch index e5cf2dd..291e36d 100644 --- a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch +++ b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Removed activeqt references from Designer, which is in its own --- qttools/src/designer/src/plugins/plugins.pro | 1 - - qttools/src/src.pro | 3 ++- + qttools/src/src.pro | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qttools/src/designer/src/plugins/plugins.pro b/qttools/src/designer/src/plugins/plugins.pro @@ -32,15 +32,6 @@ index 407c544..ed6af43 100644 } } -@@ -36,6 +35,8 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus - # We don't need these command line utilities on embedded platforms. - embedded: SUBDIRS += makeqpf - -+!wince*:!cross_compile:SUBDIRS += qdoc3 -+ - CONFIG+=ordered - QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" - -- 1.7.3.2.343.g7d43d diff --git a/patches/0108-No-qdoc3-in-qttools.patch b/patches/0108-No-qdoc3-in-qttools.patch deleted file mode 100644 index 228f1f0..0000000 --- a/patches/0108-No-qdoc3-in-qttools.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 66bcbdd5f436631b049f83a62eef64ea64f800c0 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Mon, 28 Mar 2011 13:52:32 -0500 -Subject: [PATCH] No qdoc3 in qttools - ---- - qttools/src/src.pro | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 5862320..8b6a706 100644 ---- a/qttools/src/src.pro -+++ b/qttools/src/src.pro -@@ -35,8 +35,6 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus - # We don't need these command line utilities on embedded platforms. - embedded: SUBDIRS += makeqpf - --!wince*:!cross_compile:SUBDIRS += qdoc3 -- - CONFIG+=ordered - QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" - --- -1.7.3.2.343.g7d43d - |