diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
| commit | 7b35632e80f168d8c5f2220bf610ee7e24b81270 (patch) | |
| tree | 8facf3fa565911f056a08e38f6a5eed0f756f9c6 /abs/core-testing/qt/qdoc3.patch | |
| parent | 7e10f51870aa10be3b35d7912a7b54e30f608bb8 (diff) | |
| parent | 7accc0f042acdfdca9f067b1d4011d6ac01b1a74 (diff) | |
| download | linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.zip linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.gz linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/qt/qdoc3.patch')
| -rw-r--r-- | abs/core-testing/qt/qdoc3.patch | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/abs/core-testing/qt/qdoc3.patch b/abs/core-testing/qt/qdoc3.patch index 38ae735..c967b6e 100644 --- a/abs/core-testing/qt/qdoc3.patch +++ b/abs/core-testing/qt/qdoc3.patch @@ -1,17 +1,20 @@ -diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro ---- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 2009-02-25 15:09:26.000000000 -0600 -+++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro 2009-03-04 09:30:05.000000000 -0600 -@@ -106,3 +106,7 @@ win32 { - QT_WINCONFIG = debug - } +--- tools/qdoc3/qdoc3.pro 2009-06-25 17:34:42.000000000 +0200 ++++ tools/qdoc3/qdoc3.pro.new 2009-06-25 17:35:42.000000000 +0200 +@@ -8,6 +8,11 @@ + CONFIG -= build_all + CONFIG += release } + +TARGET= qdoc3 +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target ++ + mac:CONFIG -= app_bundle + HEADERS += apigenerator.h \ + archiveextractor.h \ diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro ---- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 2009-02-25 15:09:27.000000000 -0600 -+++ qt-x11-opensource-src-4.5.0/tools/tools.pro 2009-03-04 09:44:18.000000000 -0600 +--- tools/tools.pro.qdoc3 2009-02-25 15:09:27.000000000 -0600 ++++ tools/tools.pro 2009-03-04 09:44:18.000000000 -0600 @@ -13,6 +13,7 @@ no-png { SUBDIRS += designer } |