pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Changes 4.7.1:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c72c30187aa8
branches:  trunk
changeset: 582364:c72c30187aa8
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Nov 15 13:05:44 2010 +0000

description:
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:

 x11/qt4-docs/Makefile         |   3 +-
 x11/qt4-libs/Makefile         |  34 ++++++++++++++---
 x11/qt4-libs/Makefile.common  |  20 ++++++---
 x11/qt4-libs/PLIST            |  11 +++++-
 x11/qt4-libs/distinfo         |  44 ++++++++++++----------
 x11/qt4-libs/files/qmake.conf |  22 ++++++++---
 x11/qt4-libs/patches/patch-aa |  34 +++++++++---------
 x11/qt4-libs/patches/patch-ab |  32 ++++++++--------
 x11/qt4-libs/patches/patch-ac |  14 +++---
 x11/qt4-libs/patches/patch-ad |   6 +-
 x11/qt4-libs/patches/patch-ae |  10 ++--
 x11/qt4-libs/patches/patch-ag |  14 +++---
 x11/qt4-libs/patches/patch-aj |  10 +---
 x11/qt4-libs/patches/patch-ak |   6 +-
 x11/qt4-libs/patches/patch-aq |  26 +++++++++++--
 x11/qt4-libs/patches/patch-as |   6 +-
 x11/qt4-libs/patches/patch-au |  20 +++++-----
 x11/qt4-libs/patches/patch-ax |   8 ++--
 x11/qt4-libs/patches/patch-ay |  54 +++++++++++++---------------
 x11/qt4-libs/patches/patch-az |  22 +++++-----
 x11/qt4-libs/patches/patch-ba |   6 +-
 x11/qt4-libs/patches/patch-bb |   8 ++--
 x11/qt4-libs/patches/patch-bc |  33 +++++++++++++++++
 x11/qt4-libs/patches/patch-bd |  13 ++++++
 x11/qt4-libs/patches/patch-be |  13 ++++++
 x11/qt4-libs/patches/patch-bf |  27 ++++++++++++++
 x11/qt4-mng/Makefile          |   5 +-
 x11/qt4-mysql/Makefile        |   5 +-
 x11/qt4-pgsql/Makefile        |   5 +-
 x11/qt4-qdbus/Makefile        |   5 +-
 x11/qt4-sqlite3/Makefile      |   5 +-
 x11/qt4-tiff/Makefile         |   5 +-
 x11/qt4-tools/Makefile        |  20 +++------
 x11/qt4-tools/PLIST           |  80 +++++++++++++++++++++++++++++++++---------
 x11/qt4/Makefile.common       |   6 +-
 35 files changed, 406 insertions(+), 226 deletions(-)

diffs (truncated from 1458 to 300 lines):

diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-docs/Makefile
--- a/x11/qt4-docs/Makefile     Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-docs/Makefile     Mon Nov 15 13:05:44 2010 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/09/14 11:03:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/11/15 13:05:44 adam Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-docs-${QTVERSION}
-PKGREVISION=   1
 COMMENT=       Documentation for the QT C++ X GUI toolkit
 
 NO_CONFIGURE=          yes
diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-libs/Makefile     Mon Nov 15 13:05:44 2010 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2010/09/14 11:13:16 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/11/15 13:05:45 adam Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-libs-${QTVERSION}
-PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
@@ -27,9 +26,14 @@
 
 INSTALLATION_DIRS=     lib/pkgconfig
 INSTALLATION_DIRS+=    ${QTPREFIX}/bin
+INSTALLATION_DIRS+=    ${QTPREFIX}/imports/Qt/labs/folderlistmodel
+INSTALLATION_DIRS+=    ${QTPREFIX}/imports/Qt/labs/gestures
+INSTALLATION_DIRS+=    ${QTPREFIX}/imports/Qt/labs/particles
+INSTALLATION_DIRS+=    ${QTPREFIX}/imports/QtWebKit
 INSTALLATION_DIRS+=    ${QTPREFIX}/include
 INSTALLATION_DIRS+=    ${QTPREFIX}/lib
 INSTALLATION_DIRS+=    ${QTPREFIX}/plugins/accessible
+INSTALLATION_DIRS+=    ${QTPREFIX}/plugins/bearer
 INSTALLATION_DIRS+=    ${QTPREFIX}/plugins/codecs
 INSTALLATION_DIRS+=    ${QTPREFIX}/plugins/graphicssystems
 INSTALLATION_DIRS+=    ${QTPREFIX}/plugins/iconengines
@@ -43,13 +47,25 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
 .endfor
        ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
-           ${DESTDIR}${QTPREFIX}/bin
-.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore
+               ${DESTDIR}${QTPREFIX}/bin/
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la \
+               ${DESTDIR}${QTPREFIX}/imports/Qt/labs/folderlistmodel/
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/imports/Qt/labs/gestures/libqmlgesturesplugin.la \
+               ${DESTDIR}${QTPREFIX}/imports/Qt/labs/gestures/
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/imports/Qt/labs/particles/libqmlparticlesplugin.la \
+               ${DESTDIR}${QTPREFIX}/imports/Qt/labs/particles/
+        ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/imports/QtWebKit/libqmlwebkitplugin.la \
+               ${DESTDIR}${QTPREFIX}/imports/QtWebKit/
+.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore
        cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
                ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
 .endfor
        cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtXmlPatterns QtScript QtScriptTools QtTest QtWebKit
+.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore
        ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
                ${DESTDIR}${QTPREFIX}/lib/
        sed     -e "s:${WRKSRC}:${QTPREFIX}:g" \
@@ -63,14 +79,17 @@
                ${WRKSRC}/plugins/accessible/lib${plug}.la \
                ${DESTDIR}${QTPREFIX}/plugins/accessible/
 .endfor
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/plugins/bearer/libqgenericbearer.la \
+               ${DESTDIR}${QTPREFIX}/plugins/bearer/
 .for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
        ${LIBTOOL} --mode=install ${INSTALL_LIB} \
                ${WRKSRC}/plugins/codecs/lib${codec}.la \
                ${DESTDIR}${QTPREFIX}/plugins/codecs/
 .endfor
-.for gfxs in qglgraphicssystem qtracegraphicssystem
+.for plug in qglgraphicssystem qtracegraphicssystem
        ${LIBTOOL} --mode=install ${INSTALL_LIB} \
-               ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \
+               ${WRKSRC}/plugins/graphicssystems/lib${plug}.la \
                ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
 .endfor
        ${LIBTOOL} --mode=install ${INSTALL_LIB} \
@@ -93,6 +112,7 @@
 SUBST_SED.socklen=     -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .endif
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-libs/Makefile.common      Mon Nov 15 13:05:44 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2010/07/04 06:00:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.22 2010/11/15 13:05:45 adam Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -35,6 +35,12 @@
 OPSYSVARS+=            CONFIGURE_ARGS
 CONFIGURE_ARGS+=       < ${FILESDIR}/license-acceptance
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MAKE_JOBS)
+CONFIGURE_ENV+=                MAKE_FLAGS=-j${MAKE_JOBS:Q}
+.endif
+
 LIBQT?=                        -lQtCore -lQtGui
 
 MAKE_ENV+=             QTPREFIX=${QTPREFIX:Q}
@@ -98,9 +104,9 @@
 .endif
 
 pre-configure:
-       sed     -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \
-               -e 's:@X11BASE@:${X11BASE:Q}:g' \
-               -e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \
+       sed     -e 's:@LOCALBASE@:${LOCALBASE}:g' \
+               -e 's:@X11BASE@:${X11BASE}:g' \
+               -e 's:@X11PREFIX@:${X11PREFIX}:g' \
                -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
                -e 's:@CC@:${CC:Q}:g' \
                -e 's:@CXX@:${CXX:Q}:g' \
@@ -108,14 +114,14 @@
                -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
                -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
                -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
-               -e 's:@LEX@:${LEX:Q}:g' \
+               -e 's:@LEX@:${LEX}:g' \
                -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
                -e 's:@AR@:${AR:Q}:g' \
-               -e 's:@MKDIR@:${MKDIR:Q}:g' \
+               -e 's:@MKDIR@:${MKDIR}:g' \
                -e 's:@LIBQT@:${LIBQT:Q}:g' \
                -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
                -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
-               -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG:Q}:g' \
+               -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
                -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
                ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
        for dir in ${WRKSRC}/mkspecs/*; do \
diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-libs/PLIST
--- a/x11/qt4-libs/PLIST        Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-libs/PLIST        Mon Nov 15 13:05:44 2010 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2010/02/02 14:05:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/11/15 13:05:45 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
+lib/pkgconfig/QtDeclarative.pc
 lib/pkgconfig/QtGui.pc
 lib/pkgconfig/QtMultimedia.pc
 lib/pkgconfig/QtNetwork.pc
@@ -13,12 +14,18 @@
 lib/pkgconfig/QtWebKit.pc
 lib/pkgconfig/QtXml.pc
 lib/pkgconfig/QtXmlPatterns.pc
+lib/pkgconfig/jscore.pc
 qt4/bin/moc
 qt4/bin/rcc
 qt4/bin/uic
 qt4/bin/uic3
+qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
+qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.la
+qt4/imports/Qt/labs/particles/libqmlparticlesplugin.la
+qt4/imports/QtWebKit/libqmlwebkitplugin.la
 qt4/lib/libQt3Support.la
 qt4/lib/libQtCore.la
+qt4/lib/libQtDeclarative.la
 qt4/lib/libQtGui.la
 qt4/lib/libQtMultimedia.la
 qt4/lib/libQtNetwork.la
@@ -31,8 +38,10 @@
 qt4/lib/libQtWebKit.la
 qt4/lib/libQtXml.la
 qt4/lib/libQtXmlPatterns.la
+qt4/lib/libjscore.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
+qt4/plugins/bearer/libqgenericbearer.la
 qt4/plugins/codecs/libqcncodecs.la
 qt4/plugins/codecs/libqjpcodecs.la
 qt4/plugins/codecs/libqkrcodecs.la
diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-libs/distinfo     Mon Nov 15 13:05:44 2010 +0000
@@ -1,34 +1,38 @@
-$NetBSD: distinfo,v 1.46 2010/09/03 13:47:12 drochner Exp $
+$NetBSD: distinfo,v 1.47 2010/11/15 13:05:45 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8
-RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff
-Size (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 bytes
-SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262
-SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8
-SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84
-SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9
-SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe
+SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341
+RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899
+Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes
+SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
+SHA1 (patch-ab) = a2de275815bc71f294c787c124f5596440d3ce03
+SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
+SHA1 (patch-ad) = df3a50533fdb6d71ecb83cb3d6fef9a9195ef3e6
+SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744
 SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
-SHA1 (patch-ag) = c7573bf93741d91b4f81ca5f0e7d851c1a40239a
+SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df
-SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d
+SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
+SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
 SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981
 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
 SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 1a7f8ba45c9a232c35c4db0094ae1ac2c795b6ab
+SHA1 (patch-aq) = ec88f8b47d77297cc9a06e97a0cfce5297074c68
 SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
-SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed
+SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
 SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
-SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
+SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
-SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
-SHA1 (patch-ay) = ee700d2a4bf02be6a908c0aebe8e8bfd3b1f6c38
-SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1
-SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae
-SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42
+SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
+SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
+SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
+SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
+SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
+SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
+SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
+SHA1 (patch-be) = fa9cd7a9ab77dbad48ef441832f744a574fe3d0f
+SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04
 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
diff -r 4eb1a281141c -r c72c30187aa8 x11/qt4-libs/files/qmake.conf
--- a/x11/qt4-libs/files/qmake.conf     Mon Nov 15 09:15:39 2010 +0000
+++ b/x11/qt4-libs/files/qmake.conf     Mon Nov 15 13:05:44 2010 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
-# $Id: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
+# $NetBSD: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
+# $Id: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
 #
 # qmake configuration for pkgsrc
 #
 
 MAKEFILE_GENERATOR     = UNIX
+TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui
@@ -21,6 +22,7 @@
 QMAKE_CFLAGS_RELEASE   =
 QMAKE_CFLAGS_DEBUG     = -g
 QMAKE_CFLAGS_SHLIB     = -fPIC
+QMAKE_CFLAGS_STATIC_LIB        = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 
@@ -32,6 +34,7 @@
 QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG   = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB   = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD  = $$QMAKE_CFLAGS_THREAD
 
@@ -46,6 +49,8 @@
 
 QMAKE_LINK             = @CXX@
 QMAKE_LINK_SHLIB       = @CXX@
+QMAKE_LINK_C           = @CC@
+QMAKE_LINK_C_SHLIB     = @CC@



Home | Main Index | Thread Index | Old Index