diff options
| author | adam <adam@pkgsrc.org> | 2010-11-15 13:05:44 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-11-15 13:05:44 +0000 |
| commit | 1ac510becc86fa7c18e7d5cb7f7f3baf757f8a9c (patch) | |
| tree | 3d170bce6549e2fbfcbb0cf7e03c7d62297a0ccd /x11/qt4-libs/patches/patch-ag | |
| parent | 116a6de6c5ad63b2e0d3e675573b728027eb27fd (diff) | |
| download | pkgsrc-1ac510becc86fa7c18e7d5cb7f7f3baf757f8a9c.tar.gz | |
Changes 4.7.1:
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0. For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:
http://qt.nokia.com/doc/4.7
The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
Changes 4.7.0:
Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:
http://qt.nokia.com/doc/4.7
The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
Diffstat (limited to 'x11/qt4-libs/patches/patch-ag')
| -rw-r--r-- | x11/qt4-libs/patches/patch-ag | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag index bd98dd98639..a291fc0e4db 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,14 +1,14 @@ -$NetBSD: patch-ag,v 1.11 2010/07/04 06:00:14 adam Exp $ +$NetBSD: patch-ag,v 1.12 2010/11/15 13:05:45 adam Exp $ ---- qmake/project.cpp.orig 2010-06-02 02:03:09.000000000 +0000 +--- qmake/project.cpp.orig 2010-09-10 09:04:41.000000000 +0000 +++ qmake/project.cpp -@@ -1614,6 +1614,9 @@ QMakeProject::isActiveConfig(const QStri - if(isForSymbian() && (x == "symbian" || x == "unix")) - return true; +@@ -1534,6 +1534,9 @@ QMakeProject::isActiveConfig(const QStri + return Option::target_mode == Option::TARG_WIN_MODE; + } + if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) + return true; + //mkspecs - if((Option::target_mode == Option::TARG_MACX_MODE || - Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") + static QString spec; + if(spec.isEmpty()) |