summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2009-11-18 20:53:38 +0000
committerAlex Alexander <wired@gentoo.org>2009-11-18 20:53:38 +0000
commit1040bdc0c842507242f30134441235bfc59c643b (patch)
tree32cb9ca07ec736e05d313ab8b5e8f8902ce43f4d /x11-libs/qt-assistant/files
parentRemove dependency on libdvdcss, it is not used here, Bug #286666. (diff)
downloadhistorical-1040bdc0c842507242f30134441235bfc59c643b.tar.gz
historical-1040bdc0c842507242f30134441235bfc59c643b.tar.bz2
historical-1040bdc0c842507242f30134441235bfc59c643b.zip
added 4.6.0_rc1, removed 4.6.0_beta1
Package-Manager: portage-2.2_rc50/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qt-assistant/files')
-rw-r--r--x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch (renamed from x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch)10
1 files changed, 5 insertions, 5 deletions
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch b/x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch
index b9f897dfdeab..6426ee9aef3c 100644
--- a/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch
+++ b/x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch
@@ -1,12 +1,11 @@
diff --git a/tools/tools.pro b/tools/tools.pro
-index 4b36115..d3dd1a5 100644
+index 87ba3c9..26a82ed 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
-@@ -4,31 +4,9 @@ no-png {
- message("Some graphics-related tools are unavailable without PNG support")
+@@ -5,31 +5,8 @@ no-png {
} else {
SUBDIRS += assistant \
- pixeltool \
+ pixeltool \
- porting \
- qtestlib \
- qttracereplay
@@ -20,7 +19,7 @@ index 4b36115..d3dd1a5 100644
- wince*: SUBDIRS = qtestlib designer
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
- win32:!wince*:SUBDIRS += activeqt
-+ qdoc3
++ qdoc3
}
-mac {
@@ -29,6 +28,7 @@ index 4b36115..d3dd1a5 100644
-
-embedded:SUBDIRS += kmap2qmap
-
+-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger
-contains(QT_CONFIG, dbus):SUBDIRS += qdbus
-!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
-embedded: SUBDIRS += makeqpf