diff options
| author |   Alex Alexander <wired@gentoo.org> | 2009-11-18 20:50:13 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2009-11-18 20:50:13 +0000 |
| commit | e4f4f8f65fcf04b1803ccdee4c1445cd49d992a0 (patch) | |
| tree | ac4a18d6636a204a3bf082cfe6243496262a0073 /x11-libs/qt-assistant/files | |
| parent | added 4.6.0_rc1, removed 4.6.0_beta1 (diff) | |
| download | gentoo-2-e4f4f8f65fcf04b1803ccdee4c1445cd49d992a0.tar.gz gentoo-2-e4f4f8f65fcf04b1803ccdee4c1445cd49d992a0.tar.bz2 gentoo-2-e4f4f8f65fcf04b1803ccdee4c1445cd49d992a0.zip | |
added 4.6.0_rc1, removed 4.6.0_beta1
(Portage version: 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 |