Changes 4.6.1: * Optimized empty QUrl creation * Improve performance of getting the canonical filename on Linux and Symbian by using realpath() system call. * Avoid stat() when opening a file. * Do not look at the Qt patch-level version embedded in plugins' buildkeys when trying to determine if the plugin is compatible * Bug-fixes * load() and loadFromData() can now support compressed GL textures in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics system is active and the appropriate extensions are present in the GL implementation. * Fixed a small leak when using the new QPixmapCache::Key based API.diff -r1.5 -r1.6 pkgsrc/x11/qt4/Makefile
(adam)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= qt4-${QTVERSION} | 3 | DISTNAME= qt4-${QTVERSION} | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= x11 | 4 | CATEGORIES= x11 | |
6 | MASTER_SITES= # none | 5 | MASTER_SITES= # none | |
7 | 6 | |||
8 | COMMENT= "meta-package" for the QT GUI C++ toolkit | 7 | COMMENT= "meta-package" for the QT GUI C++ toolkit | |
9 | 8 | |||
10 | META_PACKAGE= yes | 9 | META_PACKAGE= yes | |
11 | 10 | |||
12 | .include "Makefile.common" | 11 | .include "Makefile.common" | |
13 | 12 | |||
14 | DEPENDS+= qt4-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-libs | 13 | DEPENDS+= qt4-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-libs | |
15 | DEPENDS+= qt4-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-tools | 14 | DEPENDS+= qt4-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-tools | |
16 | DEPENDS+= qt4-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-docs | 15 | DEPENDS+= qt4-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-docs | |
17 | 16 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.18 2009/10/11 09:14:52 adam Exp $ | 1 | # $NetBSD: Makefile.common,v 1.19 2010/01/29 18:19:09 adam Exp $ | |
2 | # used by x11/qt4-libs/Makefile.common | 2 | # used by x11/qt4-libs/Makefile.common | |
3 | # used by x11/qt4-tools/Makefile | 3 | # used by x11/qt4-tools/Makefile | |
4 | 4 | |||
5 | QTVERSION= 4.5.3 | 5 | QTVERSION= 4.6.1 | |
6 | 6 | |||
7 | MAINTAINER?= adam@NetBSD.org | 7 | MAINTAINER?= pkgsrc-users@NetBSD.org | |
8 | HOMEPAGE= http://www.trolltech.com/products/qt/ | 8 | HOMEPAGE= http://qt.nokia.com/ |
@@ -1,72 +1,90 @@ | @@ -1,72 +1,90 @@ | |||
1 | # $NetBSD: Makefile,v 1.38 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.39 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-libs-${QTVERSION} | 7 | PKGNAME= qt4-libs-${QTVERSION} | |
8 | PKGREVISION= 3 | |||
9 | COMMENT= C++ X GUI toolkit | 8 | COMMENT= C++ X GUI toolkit | |
10 | 9 | |||
10 | # XXX this is to test what really gets installed when 'do-install' is disabled | |||
11 | INSTALL_DIRS+= src | |||
12 | ||||
11 | BUILD_TARGET= sub-src | 13 | BUILD_TARGET= sub-src | |
12 | INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers | 14 | INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers | |
13 | 15 | |||
14 | PTHREAD_OPTS+= require | 16 | PTHREAD_OPTS+= require | |
15 | UNLIMIT_RESOURCES= datasize | 17 | UNLIMIT_RESOURCES= datasize | |
16 | BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} | 18 | BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} | |
17 | 19 | |||
18 | PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST | 20 | PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST | |
19 | 21 | |||
20 | # built as plugins | 22 | # built as plugins | |
21 | CONFIGURE_ARGS+= -no-sql-sqlite | 23 | CONFIGURE_ARGS+= -no-sql-sqlite | |
22 | CONFIGURE_ARGS+= -no-libtiff | 24 | CONFIGURE_ARGS+= -no-libtiff | |
23 | 25 | |||
24 | INSTALLATION_DIRS= lib/pkgconfig | 26 | INSTALLATION_DIRS= lib/pkgconfig | |
25 | INSTALLATION_DIRS+= ${QTPREFIX}/bin | 27 | INSTALLATION_DIRS+= ${QTPREFIX}/bin | |
26 | INSTALLATION_DIRS+= ${QTPREFIX}/include | 28 | INSTALLATION_DIRS+= ${QTPREFIX}/include | |
27 | INSTALLATION_DIRS+= ${QTPREFIX}/lib | 29 | INSTALLATION_DIRS+= ${QTPREFIX}/lib | |
28 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible | 30 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible | |
31 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs | |||
32 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems | |||
33 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines | |||
29 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats | 34 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats | |
30 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods | 35 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods | |
31 | 36 | |||
32 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q} | 37 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} | |
33 | 38 | |||
34 | do-install: | 39 | do-install: | |
35 | .for prog in moc rcc uic | 40 | .for prog in moc rcc uic | |
36 | ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ | 41 | ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ | |
37 | .endfor | 42 | .endfor | |
38 | ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ | 43 | ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ | |
39 | ${DESTDIR}${QTPREFIX}/bin | 44 | ${DESTDIR}${QTPREFIX}/bin | |
40 | .for incl in corelib gui network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore | 45 | .for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore | |
41 | cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ | 46 | cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ | |
42 | ${MAKE_PROGRAM} ${INSTALL_TARGET} | 47 | ${MAKE_PROGRAM} ${INSTALL_TARGET} | |
43 | .endfor | 48 | .endfor | |
44 | cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST | 49 | cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST | |
45 | .for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit | 50 | .for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit | |
46 | ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ | 51 | ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ | |
47 | ${DESTDIR}${QTPREFIX}/lib/ | 52 | ${DESTDIR}${QTPREFIX}/lib/ | |
48 | sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ | 53 | sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ | |
49 | -e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \ | 54 | -e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \ | |
50 | ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc | 55 | ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc | |
51 | ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ | 56 | ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ | |
52 | .endfor | 57 | .endfor | |
53 | ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} | 58 | ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} | |
54 | .for plug in qtaccessiblecompatwidgets qtaccessiblewidgets | 59 | .for plug in qtaccessiblecompatwidgets qtaccessiblewidgets | |
55 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | 60 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |
56 | ${WRKSRC}/plugins/accessible/lib${plug}.la \ | 61 | ${WRKSRC}/plugins/accessible/lib${plug}.la \ | |
57 | ${DESTDIR}${QTPREFIX}/plugins/accessible/ | 62 | ${DESTDIR}${QTPREFIX}/plugins/accessible/ | |
58 | .endfor | 63 | .endfor | |
59 | .for plug in qgif qjpeg qmng qsvg | 64 | .for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs | |
65 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |||
66 | ${WRKSRC}/plugins/codecs/lib${codec}.la \ | |||
67 | ${DESTDIR}${QTPREFIX}/plugins/codecs/ | |||
68 | .endfor | |||
69 | .for gfxs in qglgraphicssystem qtracegraphicssystem | |||
70 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |||
71 | ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \ | |||
72 | ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/ | |||
73 | .endfor | |||
74 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |||
75 | ${WRKSRC}/plugins/iconengines/libqsvgicon.la \ | |||
76 | ${DESTDIR}/${QTPREFIX}/plugins/iconengines/ | |||
77 | .for plug in qgif qico qjpeg qmng qsvg | |||
60 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | 78 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |
61 | ${WRKSRC}/plugins/imageformats/lib${plug}.la \ | 79 | ${WRKSRC}/plugins/imageformats/lib${plug}.la \ | |
62 | ${DESTDIR}${QTPREFIX}/plugins/imageformats/ | 80 | ${DESTDIR}${QTPREFIX}/plugins/imageformats/ | |
63 | .endfor | 81 | .endfor | |
64 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | 82 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |
65 | ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ | 83 | ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ | |
66 | ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ | 84 | ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ | |
67 | 85 | |||
68 | .if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*) | 86 | .if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*) | |
69 | SUBST_CLASSES+= socklen | 87 | SUBST_CLASSES+= socklen | |
70 | SUBST_MESSAGE.socklen= Correcting socklen_t. | 88 | SUBST_MESSAGE.socklen= Correcting socklen_t. | |
71 | SUBST_STAGE.socklen= pre-configure | 89 | SUBST_STAGE.socklen= pre-configure | |
72 | SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h | 90 | SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.17 2009/10/23 15:47:09 tnn Exp $ | 1 | # $NetBSD: Makefile.common,v 1.18 2010/01/29 18:19:09 adam Exp $ | |
2 | # used by x11/qt4-libs/Makefile | 2 | # used by x11/qt4-libs/Makefile | |
3 | # used by x11/qt4-docs/Makefile | 3 | # used by x11/qt4-docs/Makefile | |
4 | 4 | |||
5 | DISTNAME= qt-x11-opensource-src-${QTVERSION} | 5 | DISTNAME= qt-everywhere-opensource-src-${QTVERSION} | |
6 | CATEGORIES= x11 | 6 | CATEGORIES= x11 | |
7 | MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ | 7 | MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ | |
8 | ftp://ftp.qtsoftware.com/qt/source/ | 8 | ftp://ftp.qtsoftware.com/qt/source/ | |
9 | #EXTRACT_SUFX= .tar.bz2 | 9 | #EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | .include "../../x11/qt4/Makefile.common" | 11 | .include "../../x11/qt4/Makefile.common" | |
12 | 12 | |||
13 | DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo | 13 | DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo | |
14 | FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files | 14 | FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files | |
15 | PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches | 15 | PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches | |
16 | 16 | |||
17 | HAS_CONFIGURE= yes | 17 | HAS_CONFIGURE= yes | |
18 | USE_LANGUAGES= c c++ | 18 | USE_LANGUAGES= c c++ |
@@ -1,37 +1,46 @@ | @@ -1,37 +1,46 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.11 2009/07/02 18:26:45 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.12 2010/01/29 18:19:09 adam Exp $ | |
2 | lib/pkgconfig/Qt3Support.pc | 2 | lib/pkgconfig/Qt3Support.pc | |
3 | lib/pkgconfig/QtCore.pc | 3 | lib/pkgconfig/QtCore.pc | |
4 | lib/pkgconfig/QtGui.pc | 4 | lib/pkgconfig/QtGui.pc | |
5 | lib/pkgconfig/QtNetwork.pc | 5 | lib/pkgconfig/QtNetwork.pc | |
6 | lib/pkgconfig/QtOpenGL.pc | 6 | lib/pkgconfig/QtOpenGL.pc | |
7 | lib/pkgconfig/QtScript.pc | 7 | lib/pkgconfig/QtScript.pc | |
8 | lib/pkgconfig/QtScriptTools.pc | 8 | lib/pkgconfig/QtScriptTools.pc | |
9 | lib/pkgconfig/QtSql.pc | 9 | lib/pkgconfig/QtSql.pc | |
10 | lib/pkgconfig/QtSvg.pc | 10 | lib/pkgconfig/QtSvg.pc | |
11 | lib/pkgconfig/QtTest.pc | 11 | lib/pkgconfig/QtTest.pc | |
12 | lib/pkgconfig/QtWebKit.pc | 12 | lib/pkgconfig/QtWebKit.pc | |
13 | lib/pkgconfig/QtXml.pc | 13 | lib/pkgconfig/QtXml.pc | |
14 | qt4/bin/moc | 14 | qt4/bin/moc | |
15 | qt4/bin/rcc | 15 | qt4/bin/rcc | |
16 | qt4/bin/uic | 16 | qt4/bin/uic | |
17 | qt4/bin/uic3 | 17 | qt4/bin/uic3 | |
18 | qt4/lib/libQt3Support.la | 18 | qt4/lib/libQt3Support.la | |
19 | qt4/lib/libQtCore.la | 19 | qt4/lib/libQtCore.la | |
20 | qt4/lib/libQtGui.la | 20 | qt4/lib/libQtGui.la | |
21 | qt4/lib/libQtMultimedia.la | |||
21 | qt4/lib/libQtNetwork.la | 22 | qt4/lib/libQtNetwork.la | |
22 | qt4/lib/libQtOpenGL.la | 23 | qt4/lib/libQtOpenGL.la | |
23 | qt4/lib/libQtScript.la | 24 | qt4/lib/libQtScript.la | |
24 | qt4/lib/libQtScriptTools.la | 25 | qt4/lib/libQtScriptTools.la | |
25 | qt4/lib/libQtSql.la | 26 | qt4/lib/libQtSql.la | |
26 | qt4/lib/libQtSvg.la | 27 | qt4/lib/libQtSvg.la | |
27 | qt4/lib/libQtTest.la | 28 | qt4/lib/libQtTest.la | |
28 | qt4/lib/libQtWebKit.la | 29 | qt4/lib/libQtWebKit.la | |
29 | qt4/lib/libQtXml.la | 30 | qt4/lib/libQtXml.la | |
30 | qt4/plugins/accessible/libqtaccessiblecompatwidgets.la | 31 | qt4/plugins/accessible/libqtaccessiblecompatwidgets.la | |
31 | qt4/plugins/accessible/libqtaccessiblewidgets.la | 32 | qt4/plugins/accessible/libqtaccessiblewidgets.la | |
33 | qt4/plugins/codecs/libqcncodecs.la | |||
34 | qt4/plugins/codecs/libqjpcodecs.la | |||
35 | qt4/plugins/codecs/libqkrcodecs.la | |||
36 | qt4/plugins/codecs/libqtwcodecs.la | |||
37 | qt4/plugins/graphicssystems/libqglgraphicssystem.la | |||
38 | qt4/plugins/graphicssystems/libqtracegraphicssystem.la | |||
39 | qt4/plugins/iconengines/libqsvgicon.la | |||
32 | qt4/plugins/imageformats/libqgif.la | 40 | qt4/plugins/imageformats/libqgif.la | |
41 | qt4/plugins/imageformats/libqico.la | |||
33 | qt4/plugins/imageformats/libqjpeg.la | 42 | qt4/plugins/imageformats/libqjpeg.la | |
34 | qt4/plugins/imageformats/libqmng.la | 43 | qt4/plugins/imageformats/libqmng.la | |
35 | qt4/plugins/imageformats/libqsvg.la | 44 | qt4/plugins/imageformats/libqsvg.la | |
36 | qt4/plugins/inputmethods/libqimsw-multi.la | 45 | qt4/plugins/inputmethods/libqimsw-multi.la | |
37 | qt4/q3porting.xml | 46 | qt4/q3porting.xml |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.16 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= qt4-libs | 3 | BUILDLINK_TREE+= qt4-libs | |
4 | 4 | |||
5 | .if !defined(QT4_LIBS_BUILDLINK3_MK) | 5 | .if !defined(QT4_LIBS_BUILDLINK3_MK) | |
6 | QT4_LIBS_BUILDLINK3_MK:= | 6 | QT4_LIBS_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0 | 8 | BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0 | |
9 | BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.5.3nb3 | 9 | BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.5.3nb3 | |
10 | BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs | 10 | BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs | |
11 | 11 | |||
12 | BUILDLINK_INCDIRS.qt4-libs+= qt4/include | 12 | BUILDLINK_INCDIRS.qt4-libs+= qt4/include | |
13 | BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib | 13 | BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib | |
14 | 14 | |||
@@ -33,22 +33,22 @@ PTHREAD_OPTS+= require | @@ -33,22 +33,22 @@ PTHREAD_OPTS+= require | |||
33 | .if ${X11_TYPE} == "modular" | 33 | .if ${X11_TYPE} == "modular" | |
34 | .include "../../x11/libXinerama/buildlink3.mk" | 34 | .include "../../x11/libXinerama/buildlink3.mk" | |
35 | .endif | 35 | .endif | |
36 | .include "../../mk/pthread.buildlink3.mk" | 36 | .include "../../mk/pthread.buildlink3.mk" | |
37 | 37 | |||
38 | pkgbase := qt4-libs | 38 | pkgbase := qt4-libs | |
39 | .include "../../mk/pkg-build-options.mk" | 39 | .include "../../mk/pkg-build-options.mk" | |
40 | .if !empty(PKG_BUILD_OPTIONS.qt4-libs:Mgtk2) | 40 | .if !empty(PKG_BUILD_OPTIONS.qt4-libs:Mgtk2) | |
41 | . include "../../devel/glib2/buildlink3.mk" | 41 | . include "../../devel/glib2/buildlink3.mk" | |
42 | #. include "../../x11/gtk2/buildlink3.mk" | 42 | #. include "../../x11/gtk2/buildlink3.mk" | |
43 | .endif | 43 | .endif | |
44 | 44 | |||
45 | .if !defined(BUILD_QT4) | 45 | .if !defined(BUILD_QT4) | |
46 | CONFIGURE_ENV+= QTDIR=${QTDIR:Q} | 46 | CONFIGURE_ENV+= QTDIR=${QTDIR} | |
47 | MAKE_ENV+= QTDIR=${QTDIR:Q} | 47 | MAKE_ENV+= QTDIR=${QTDIR} | |
48 | .endif | 48 | .endif | |
49 | 49 | |||
50 | CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" | 50 | CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" | |
51 | MAKE_ENV+= MOC="${QTDIR}/bin/moc" | 51 | MAKE_ENV+= MOC="${QTDIR}/bin/moc" | |
52 | .endif # QT4_LIBS_BUILDLINK3_MK | 52 | .endif # QT4_LIBS_BUILDLINK3_MK | |
53 | 53 | |||
54 | BUILDLINK_TREE+= -qt4-libs | 54 | BUILDLINK_TREE+= -qt4-libs |
@@ -1,29 +1,29 @@ | @@ -1,29 +1,29 @@ | |||
1 | $NetBSD: distinfo,v 1.36 2010/01/08 09:56:09 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.37 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (qt-x11-opensource-src-4.5.3.tar.gz) = 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 | 3 | SHA1 (qt-everywhere-opensource-src-4.6.1.tar.gz) = d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 | |
4 | RMD160 (qt-x11-opensource-src-4.5.3.tar.gz) = 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 | 4 | RMD160 (qt-everywhere-opensource-src-4.6.1.tar.gz) = 7365dfe3c688df36002d2c9aaef6b79ba8175402 | |
5 | Size (qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 bytes | 5 | Size (qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277 bytes | |
6 | SHA1 (patch-aa) = 5d0c638f1985f4cfcc1fa6824822dc9ab9bc96eb | 6 | SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262 | |
7 | SHA1 (patch-ab) = caac46e91dd061f28093384b0ab56b5fd78cad0d | 7 | SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8 | |
8 | SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b | 8 | SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84 | |
9 | SHA1 (patch-ad) = 98cb6c33102e9e38621b0169fb9e03e72443884b | 9 | SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9 | |
10 | SHA1 (patch-ae) = 37e68cb981b79f0ebe4afe58de3a09083d536532 | 10 | SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe | |
11 | SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d | 11 | SHA1 (patch-af) = 9e49533cb835538a949bd71b53cebe15ab59b9de | |
12 | SHA1 (patch-ag) = 7f91004562f417477a10fdb54372b01812942648 | 12 | SHA1 (patch-ag) = 6f31f1f5161cf5ad0d9fc09b097d3763e72e6bd6 | |
13 | SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 | 13 | SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 | |
14 | SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 | 14 | SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 | |
15 | SHA1 (patch-aj) = cea33ca34c5f46c3c12e4d00a991103aca70a1ed | 15 | SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df | |
16 | SHA1 (patch-ak) = 8a77ab0d047c017eb70b588c78ec4230d1f90755 | 16 | SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d | |
17 | SHA1 (patch-al) = 2f3cef08de80d70dba6b44ad946acb56916afcf5 | 17 | SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981 | |
18 | SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 | 18 | SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 | |
19 | SHA1 (patch-an) = 75812ead7851ba81bf56f85ab3feeea8377f64c7 | 19 | SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 | |
20 | SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9 | 20 | SHA1 (patch-ao) = 314769424b9ae5d7e794decb2f67a10820714ff5 | |
21 | SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 | 21 | SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 | |
22 | SHA1 (patch-aq) = 3425c5599749eac7a8dd8142292808029a7419fe | 22 | SHA1 (patch-aq) = 361befdb8e9110edffca5f82be1eb7a8923e5fa4 | |
23 | SHA1 (patch-ar) = 1cdbbadf309f5f7b29a113d4253ea6ab419f77dd | 23 | SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a | |
24 | SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed | 24 | SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed | |
25 | SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed | 25 | SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed | |
26 | SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 | |||
26 | SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf | 27 | SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf | |
27 | SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061 | 28 | SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6 | |
28 | SHA1 (patch-ca) = ae3098989a57fef9874dfc024a4821d274ebda48 | 29 | SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 | |
29 | SHA1 (patch-cb) = d520bc2a828dabada78af5a2aa110f98dc67ba73 |
@@ -1,36 +1,36 @@ | @@ -1,36 +1,36 @@ | |||
1 | $NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200 | 3 | --- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000 | |
4 | +++ qmake/generators/unix/unixmake2.cpp | 4 | +++ qmake/generators/unix/unixmake2.cpp | |
5 | @@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT | 5 | @@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT | |
6 | if(!project->isEmpty("QMAKE_BUNDLE")) { | 6 | if(!project->isEmpty("QMAKE_BUNDLE")) { | |
7 | t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; | 7 | t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; | |
8 | t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; | 8 | t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; | |
9 | + } else if(project->isActiveConfig("compile_libtool")) { | 9 | + } else if(project->isActiveConfig("compile_libtool")) { | |
10 | + t << "TARGETD = " << var("TARGET_la") << endl; | 10 | + t << "TARGETD = " << var("TARGET_la") << endl; | |
11 | } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { | 11 | } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { | |
12 | t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; | 12 | t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; | |
13 | t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; | 13 | t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; | |
14 | @@ -993,8 +995,12 @@ void UnixMakefileGenerator::init2() | 14 | @@ -994,8 +996,12 @@ void UnixMakefileGenerator::init2() | |
15 | } else if (project->isActiveConfig("staticlib")) { | 15 | } else if (project->isActiveConfig("staticlib")) { | |
16 | project->values("TARGET").first().prepend("lib"); | 16 | project->values("TARGET").first().prepend("lib"); | |
17 | project->values("TARGET").first() += ".a"; | 17 | project->values("TARGET").first() += ".a"; | |
18 | - if(project->values("QMAKE_AR_CMD").isEmpty()) | 18 | - if(project->values("QMAKE_AR_CMD").isEmpty()) | |
19 | + if(project->values("QMAKE_AR_CMD").isEmpty()) { | 19 | + if(project->values("QMAKE_AR_CMD").isEmpty()) { | |
20 | + if(project->isActiveConfig("compile_libtool")) | 20 | + if(project->isActiveConfig("compile_libtool")) | |
21 | + project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)"); | 21 | + project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)"); | |
22 | + else | 22 | + else | |
23 | project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)"); | 23 | project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)"); | |
24 | + } | 24 | + } | |
25 | } else { | 25 | } else { | |
26 | project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); | 26 | project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); | |
27 | if(project->isActiveConfig("compile_libtool")) | 27 | if(project->isActiveConfig("compile_libtool")) | |
28 | @@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil | 28 | @@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil | |
29 | bundle = bundle.left(suffix); | 29 | bundle = bundle.left(suffix); | |
30 | pkgConfiglibName = "-framework " + bundle + " "; | 30 | pkgConfiglibName = "-framework " + bundle + " "; | |
31 | } else { | 31 | } else { | |
32 | - pkgConfiglibDir = "-L${libdir}"; | 32 | - pkgConfiglibDir = "-L${libdir}"; | |
33 | + pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}"; | 33 | + pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}"; | |
34 | pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); | 34 | pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); | |
35 | } | 35 | } | |
36 | t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; | 36 | t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; |
@@ -1,107 +1,107 @@ | @@ -1,107 +1,107 @@ | |||
1 | $NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/gui/painting/painting.pri.orig 2009-09-29 13:01:37.000000000 +0200 | 3 | --- src/gui/painting/painting.pri.orig 2010-01-15 17:01:35.000000000 +0000 | |
4 | +++ src/gui/painting/painting.pri | 4 | +++ src/gui/painting/painting.pri | |
5 | @@ -231,7 +231,7 @@ contains(QMAKE_MAC_XARCH, no) { | 5 | @@ -232,7 +232,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
6 | 6 | |||
7 | win32-g++|!win32:!*-icc* { | 7 | win32-g++|!win32:!*-icc* { | |
8 | mmx { | 8 | mmx { | |
9 | - mmx_compiler.commands = $$QMAKE_CXX -c -Winline | 9 | - mmx_compiler.commands = $$QMAKE_CXX -c -Winline | |
10 | + mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 10 | + mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
11 | 11 | |||
12 | mac { | 12 | mac { | |
13 | mmx_compiler.commands += -Xarch_i386 -mmmx | 13 | mmx_compiler.commands += -Xarch_i386 -mmmx | |
14 | @@ -242,7 +242,7 @@ contains(QMAKE_MAC_XARCH, no) { | 14 | @@ -243,7 +243,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
15 | 15 | |||
16 | mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 16 | mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
17 | mmx_compiler.dependency_type = TYPE_C | 17 | mmx_compiler.dependency_type = TYPE_C | |
18 | - mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 18 | - mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
19 | + mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 19 | + mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
20 | mmx_compiler.input = MMX_SOURCES | 20 | mmx_compiler.input = MMX_SOURCES | |
21 | mmx_compiler.variable_out = OBJECTS | 21 | mmx_compiler.variable_out = OBJECTS | |
22 | mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} | 22 | mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} | |
23 | @@ -250,7 +250,7 @@ contains(QMAKE_MAC_XARCH, no) { | 23 | @@ -251,7 +251,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
24 | QMAKE_EXTRA_COMPILERS += mmx_compiler | 24 | QMAKE_EXTRA_COMPILERS += mmx_compiler | |
25 | } | 25 | } | |
26 | 3dnow { | 26 | 3dnow { | |
27 | - mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline | 27 | - mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline | |
28 | + mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 28 | + mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
29 | 29 | |||
30 | mac { | 30 | mac { | |
31 | mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx | 31 | mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx | |
32 | @@ -261,14 +261,14 @@ contains(QMAKE_MAC_XARCH, no) { | 32 | @@ -262,14 +262,14 @@ contains(QMAKE_MAC_XARCH, no) { | |
33 | 33 | |||
34 | mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 34 | mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
35 | mmx3dnow_compiler.dependency_type = TYPE_C | 35 | mmx3dnow_compiler.dependency_type = TYPE_C | |
36 | - mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 36 | - mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
37 | + mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 37 | + mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
38 | mmx3dnow_compiler.input = MMX3DNOW_SOURCES | 38 | mmx3dnow_compiler.input = MMX3DNOW_SOURCES | |
39 | mmx3dnow_compiler.variable_out = OBJECTS | 39 | mmx3dnow_compiler.variable_out = OBJECTS | |
40 | mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN} | 40 | mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN} | |
41 | silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands | 41 | silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands | |
42 | QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler | 42 | QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler | |
43 | sse { | 43 | sse { | |
44 | - sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline | 44 | - sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline | |
45 | + sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 45 | + sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
46 | 46 | |||
47 | mac { | 47 | mac { | |
48 | sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse | 48 | sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse | |
49 | @@ -279,7 +279,7 @@ contains(QMAKE_MAC_XARCH, no) { | 49 | @@ -280,7 +280,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
50 | 50 | |||
51 | sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 51 | sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
52 | sse3dnow_compiler.dependency_type = TYPE_C | 52 | sse3dnow_compiler.dependency_type = TYPE_C | |
53 | - sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 53 | - sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
54 | + sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 54 | + sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
55 | sse3dnow_compiler.input = SSE3DNOW_SOURCES | 55 | sse3dnow_compiler.input = SSE3DNOW_SOURCES | |
56 | sse3dnow_compiler.variable_out = OBJECTS | 56 | sse3dnow_compiler.variable_out = OBJECTS | |
57 | sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} | 57 | sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} | |
58 | @@ -288,7 +288,7 @@ contains(QMAKE_MAC_XARCH, no) { | 58 | @@ -289,7 +289,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
59 | } | 59 | } | |
60 | } | 60 | } | |
61 | sse { | 61 | sse { | |
62 | - sse_compiler.commands = $$QMAKE_CXX -c -Winline | 62 | - sse_compiler.commands = $$QMAKE_CXX -c -Winline | |
63 | + sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 63 | + sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
64 | 64 | |||
65 | mac { | 65 | mac { | |
66 | sse_compiler.commands += -Xarch_i386 -msse | 66 | sse_compiler.commands += -Xarch_i386 -msse | |
67 | @@ -299,7 +299,7 @@ contains(QMAKE_MAC_XARCH, no) { | 67 | @@ -300,7 +300,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
68 | 68 | |||
69 | sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 69 | sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
70 | sse_compiler.dependency_type = TYPE_C | 70 | sse_compiler.dependency_type = TYPE_C | |
71 | - sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 71 | - sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
72 | + sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 72 | + sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
73 | sse_compiler.input = SSE_SOURCES | 73 | sse_compiler.input = SSE_SOURCES | |
74 | sse_compiler.variable_out = OBJECTS | 74 | sse_compiler.variable_out = OBJECTS | |
75 | sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} | 75 | sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} | |
76 | @@ -307,7 +307,7 @@ contains(QMAKE_MAC_XARCH, no) { | 76 | @@ -308,7 +308,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
77 | QMAKE_EXTRA_COMPILERS += sse_compiler | 77 | QMAKE_EXTRA_COMPILERS += sse_compiler | |
78 | } | 78 | } | |
79 | sse2 { | 79 | sse2 { | |
80 | - sse2_compiler.commands = $$QMAKE_CXX -c -Winline | 80 | - sse2_compiler.commands = $$QMAKE_CXX -c -Winline | |
81 | + sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 81 | + sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
82 | 82 | |||
83 | mac { | 83 | mac { | |
84 | sse2_compiler.commands += -Xarch_i386 -msse2 | 84 | sse2_compiler.commands += -Xarch_i386 -msse2 | |
85 | @@ -318,7 +318,7 @@ contains(QMAKE_MAC_XARCH, no) { | 85 | @@ -319,7 +319,7 @@ contains(QMAKE_MAC_XARCH, no) { | |
86 | 86 | |||
87 | sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 87 | sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
88 | sse2_compiler.dependency_type = TYPE_C | 88 | sse2_compiler.dependency_type = TYPE_C | |
89 | - sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 89 | - sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
90 | + sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 90 | + sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
91 | sse2_compiler.input = SSE2_SOURCES | 91 | sse2_compiler.input = SSE2_SOURCES | |
92 | sse2_compiler.variable_out = OBJECTS | 92 | sse2_compiler.variable_out = OBJECTS | |
93 | sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} | 93 | sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} | |
94 | @@ -326,11 +326,11 @@ contains(QMAKE_MAC_XARCH, no) { | 94 | @@ -327,11 +327,11 @@ contains(QMAKE_MAC_XARCH, no) { | |
95 | QMAKE_EXTRA_COMPILERS += sse2_compiler | 95 | QMAKE_EXTRA_COMPILERS += sse2_compiler | |
96 | } | 96 | } | |
97 | iwmmxt { | 97 | iwmmxt { | |
98 | - iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline | 98 | - iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline | |
99 | + iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | 99 | + iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline | |
100 | iwmmxt_compiler.commands += -mcpu=iwmmxt | 100 | iwmmxt_compiler.commands += -mcpu=iwmmxt | |
101 | iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | 101 | iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} | |
102 | iwmmxt_compiler.dependency_type = TYPE_C | 102 | iwmmxt_compiler.dependency_type = TYPE_C | |
103 | - iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | 103 | - iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} | |
104 | + iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | 104 | + iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo | |
105 | iwmmxt_compiler.input = IWMMXT_SOURCES | 105 | iwmmxt_compiler.input = IWMMXT_SOURCES | |
106 | iwmmxt_compiler.variable_out = OBJECTS | 106 | iwmmxt_compiler.variable_out = OBJECTS | |
107 | iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN} | 107 | iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN} |
@@ -1,40 +1,40 @@ | @@ -1,40 +1,40 @@ | |||
1 | $NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/corelib/global/qglobal.h.orig 2009-09-29 13:01:37.000000000 +0200 | 3 | --- src/corelib/global/qglobal.h.orig 2010-01-15 17:01:36.000000000 +0000 | |
4 | +++ src/corelib/global/qglobal.h | 4 | +++ src/corelib/global/qglobal.h | |
5 | @@ -158,6 +158,7 @@ namespace QT_NAMESPACE {} | 5 | @@ -159,6 +159,7 @@ namespace QT_NAMESPACE {} | |
6 | NETBSD - NetBSD | 6 | NETBSD - NetBSD | |
7 | OPENBSD - OpenBSD | 7 | OPENBSD - OpenBSD | |
8 | BSDI - BSD/OS | 8 | BSDI - BSD/OS | |
9 | + INTERIX - Interix | 9 | + INTERIX - Interix | |
10 | IRIX - SGI Irix | 10 | IRIX - SGI Irix | |
11 | OSF - HP Tru64 UNIX | 11 | OSF - HP Tru64 UNIX | |
12 | SCO - SCO OpenServer 5 | 12 | SCO - SCO OpenServer 5 | |
13 | @@ -219,6 +220,9 @@ namespace QT_NAMESPACE {} | 13 | @@ -224,6 +225,9 @@ namespace QT_NAMESPACE {} | |
14 | #elif defined(__NetBSD__) | 14 | #elif defined(__NetBSD__) | |
15 | # define Q_OS_NETBSD | 15 | # define Q_OS_NETBSD | |
16 | # define Q_OS_BSD4 | 16 | # define Q_OS_BSD4 | |
17 | +#elif defined(__INTERIX) | 17 | +#elif defined(__INTERIX) | |
18 | +# define Q_OS_INTERIX | 18 | +# define Q_OS_INTERIX | |
19 | +# define Q_OS_BSD4 | 19 | +# define Q_OS_BSD4 | |
20 | #elif defined(__OpenBSD__) | 20 | #elif defined(__OpenBSD__) | |
21 | # define Q_OS_OPENBSD | 21 | # define Q_OS_OPENBSD | |
22 | # define Q_OS_BSD4 | 22 | # define Q_OS_BSD4 | |
23 | @@ -261,8 +265,6 @@ namespace QT_NAMESPACE {} | 23 | @@ -266,8 +270,6 @@ namespace QT_NAMESPACE {} | |
24 | #endif | 24 | #endif | |
25 | 25 | |||
26 | #if defined(Q_OS_DARWIN) | 26 | #if defined(Q_OS_DARWIN) | |
27 | -# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */ | 27 | -# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */ | |
28 | -# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/ | 28 | -# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/ | |
29 | # if defined(Q_OS_DARWIN64) | 29 | # if defined(Q_OS_DARWIN64) | |
30 | # define Q_OS_MAC64 | 30 | # define Q_OS_MAC64 | |
31 | # elif defined(Q_OS_DARWIN32) | 31 | # elif defined(Q_OS_DARWIN32) | |
32 | @@ -756,8 +758,6 @@ namespace QT_NAMESPACE {} | 32 | @@ -805,8 +807,6 @@ namespace QT_NAMESPACE {} | |
33 | # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" | 33 | # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" | |
34 | #elif defined(Q_OS_UNIX) | 34 | #elif defined(Q_OS_UNIX) | |
35 | # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS) | 35 | # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS) | |
36 | -# define Q_WS_MAC | 36 | -# define Q_WS_MAC | |
37 | -# define Q_WS_MACX | 37 | -# define Q_WS_MACX | |
38 | # if defined(Q_OS_MAC64) | 38 | # if defined(Q_OS_MAC64) | |
39 | # define Q_WS_MAC64 | 39 | # define Q_WS_MAC64 | |
40 | # elif defined(Q_OS_MAC32) | 40 | # elif defined(Q_OS_MAC32) |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-ag,v 1.9 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ag,v 1.10 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- qmake/project.cpp.orig 2009-09-29 13:01:33.000000000 +0200 | 3 | --- qmake/project.cpp.orig 2010-01-15 17:01:30.000000000 +0000 | |
4 | +++ qmake/project.cpp | 4 | +++ qmake/project.cpp | |
5 | @@ -1609,6 +1609,9 @@ QMakeProject::isActiveConfig(const QStri | 5 | @@ -1612,6 +1612,9 @@ QMakeProject::isActiveConfig(const QStri | |
6 | else if(x == "false") | 6 | if(isForSymbian() && (x == "symbian" || x == "unix")) | |
7 | return false; | 7 | return true; | |
8 | 8 | |||
9 | + if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) | 9 | + if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) | |
10 | + return true; | 10 | + return true; | |
11 | + | 11 | + | |
12 | //mkspecs | 12 | //mkspecs | |
13 | if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || | 13 | if((Option::target_mode == Option::TARG_MACX_MODE || | |
14 | Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") | 14 | Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.2 2008/07/24 12:55:20 markd Exp $ | 1 | $NetBSD: patch-ac,v 1.3 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- tools/designer/src/designer/designer.pro.orig 2008-04-28 15:11:20.000000000 +0200 | 3 | --- tools/designer/src/designer/designer.pro.orig 2010-01-15 17:01:29.000000000 +0000 | |
4 | +++ tools/designer/src/designer/designer.pro | 4 | +++ tools/designer/src/designer/designer.pro | |
5 | @@ -13,7 +13,7 @@ INCLUDEPATH += \ | 5 | @@ -14,7 +14,7 @@ INCLUDEPATH += \ | |
6 | ../lib/uilib \ | 6 | ../lib/uilib \ | |
7 | extra | 7 | extra | |
8 | 8 | |||
9 | -LIBS += -L../../lib \ | 9 | -LIBS += -L../../lib \ | |
10 | +LIBS += \ | 10 | +LIBS += \ | |
11 | -L../../../../lib \ | 11 | -L../../../../lib \ | |
12 | -lQtDesignerComponents \ | 12 | -lQtDesignerComponents \ | |
13 | -lQtDesigner | 13 | -lQtDesigner |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200 | 3 | --- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000 | |
4 | +++ qmake/generators/unix/unixmake.cpp | 4 | +++ qmake/generators/unix/unixmake.cpp | |
5 | @@ -324,27 +324,29 @@ UnixMakefileGenerator::init() | 5 | @@ -325,27 +325,29 @@ UnixMakefileGenerator::init() | |
6 | if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { | 6 | if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { | |
7 | libtool_flags += " --mode=link"; | 7 | libtool_flags += " --mode=link"; | |
8 | if(project->isActiveConfig("staticlib")) { | 8 | if(project->isActiveConfig("staticlib")) { | |
9 | - libtool_flags += " -static"; | 9 | - libtool_flags += " -static"; | |
10 | + comp_flags += " -static"; | 10 | + comp_flags += " -static"; | |
11 | } else { | 11 | } else { | |
12 | if(!project->isEmpty("QMAKE_LIB_FLAG")) { | 12 | if(!project->isEmpty("QMAKE_LIB_FLAG")) { | |
13 | + if(project->isActiveConfig("plugin")) | 13 | + if(project->isActiveConfig("plugin")) | |
14 | + comp_flags += " -avoid-version"; | 14 | + comp_flags += " -avoid-version"; | |
15 | + else { | 15 | + else { | |
16 | int maj = project->first("VER_MAJ").toInt(); | 16 | int maj = project->first("VER_MAJ").toInt(); | |
17 | int min = project->first("VER_MIN").toInt(); | 17 | int min = project->first("VER_MIN").toInt(); | |
18 | int pat = project->first("VER_PAT").toInt(); | 18 | int pat = project->first("VER_PAT").toInt(); | |
@@ -32,35 +32,35 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14 | @@ -32,35 +32,35 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14 | |||
32 | + QString rpath = Option::fixPathToTargetOS(project->first("target.path"), FALSE); | 32 | + QString rpath = Option::fixPathToTargetOS(project->first("target.path"), FALSE); | |
33 | + if(rpath.right(1) != Option::dir_sep) | 33 | + if(rpath.right(1) != Option::dir_sep) | |
34 | + rpath += Option::dir_sep; | 34 | + rpath += Option::dir_sep; | |
35 | comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); | 35 | comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); | |
36 | } | 36 | } | |
37 | } | 37 | } | |
38 | } | 38 | } | |
39 | if(project->isActiveConfig("plugin")) | 39 | if(project->isActiveConfig("plugin")) | |
40 | - libtool_flags += " -module"; | 40 | - libtool_flags += " -module"; | |
41 | + comp_flags += " -module"; | 41 | + comp_flags += " -module"; | |
42 | } else { | 42 | } else { | |
43 | libtool_flags += " --mode=compile"; | 43 | libtool_flags += " --mode=compile"; | |
44 | } | 44 | } | |
45 | @@ -676,7 +678,6 @@ UnixMakefileGenerator::defaultInstall(co | 45 | @@ -677,7 +679,6 @@ UnixMakefileGenerator::defaultInstall(co | |
46 | QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); | 46 | QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); | |
47 | if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) | 47 | if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) | |
48 | destdir += Option::dir_sep; | 48 | destdir += Option::dir_sep; | |
49 | - targetdir = fileFixify(targetdir, FileFixifyAbsolute); | 49 | - targetdir = fileFixify(targetdir, FileFixifyAbsolute); | |
50 | if(targetdir.right(1) != Option::dir_sep) | 50 | if(targetdir.right(1) != Option::dir_sep) | |
51 | targetdir += Option::dir_sep; | 51 | targetdir += Option::dir_sep; | |
52 | 52 | |||
53 | @@ -714,10 +715,14 @@ UnixMakefileGenerator::defaultInstall(co | 53 | @@ -715,10 +716,14 @@ UnixMakefileGenerator::defaultInstall(co | |
54 | QString src_targ = target; | 54 | QString src_targ = target; | |
55 | if(src_targ == "$(TARGET)") | 55 | if(src_targ == "$(TARGET)") | |
56 | src_targ = "$(TARGETL)"; | 56 | src_targ = "$(TARGETL)"; | |
57 | - QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); | 57 | - QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); | |
58 | + QString dst_dir = targetdir; | 58 | + QString dst_dir = targetdir; | |
59 | if(QDir::isRelativePath(dst_dir)) | 59 | if(QDir::isRelativePath(dst_dir)) | |
60 | - dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); | 60 | - dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); | |
61 | - ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; | 61 | - ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; | |
62 | + dst_dir = Option::fixPathToTargetOS(dst_dir); | 62 | + dst_dir = Option::fixPathToTargetOS(dst_dir); | |
63 | + if(!ret.isEmpty()) | 63 | + if(!ret.isEmpty()) | |
64 | + ret += "\n\t"; | 64 | + ret += "\n\t"; | |
65 | + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; | 65 | + ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; | |
66 | + if(!uninst.isEmpty()) | 66 | + if(!uninst.isEmpty()) |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: patch-aj,v 1.7 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- mkspecs/netbsd-g++/qplatformdefs.h.orig 2009-09-29 13:01:33.000000000 +0200 | 3 | --- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-01-15 17:01:28.000000000 +0000 | |
4 | +++ mkspecs/netbsd-g++/qplatformdefs.h | 4 | +++ mkspecs/netbsd-g++/qplatformdefs.h | |
5 | @@ -65,6 +65,7 @@ | 5 | @@ -65,6 +65,7 @@ | |
6 | #include <sys/types.h> | 6 | #include <sys/types.h> | |
7 | #include <sys/ioctl.h> | 7 | #include <sys/ioctl.h> | |
8 | #include <sys/ipc.h> | 8 | #include <sys/ipc.h> | |
9 | +#include <sys/param.h> | 9 | +#include <sys/param.h> | |
10 | #include <sys/time.h> | 10 | #include <sys/time.h> | |
11 | #include <sys/shm.h> | 11 | #include <sys/shm.h> | |
12 | #include <sys/socket.h> | 12 | #include <sys/socket.h> | |
13 | @@ -126,10 +127,14 @@ | 13 | @@ -127,10 +128,14 @@ | |
14 | #define QT_SNPRINTF ::snprintf | 14 | #define QT_SNPRINTF ::snprintf | |
15 | #define QT_VSNPRINTF ::vsnprintf | 15 | #define QT_VSNPRINTF ::vsnprintf | |
16 | 16 | |||
17 | +#if (__NetBSD_Version__ >= 299000900) | 17 | +#if (__NetBSD_Version__ >= 299000900) | |
18 | +#include <sys/statvfs.h> | 18 | +#include <sys/statvfs.h> | |
19 | +#define QT_STATVFS 1 | 19 | +#define QT_STATVFS 1 | |
20 | +#endif | 20 | +#endif | |
21 | + | 21 | + | |
22 | // Older NetBSD versions may still use the a.out format instead of ELF. | 22 | // Older NetBSD versions may still use the a.out format instead of ELF. | |
23 | #ifndef __ELF__ | 23 | #ifndef __ELF__ | |
24 | #define QT_AOUT_UNDERSCORE | 24 | #define QT_AOUT_UNDERSCORE | |
25 | #endif | 25 | #endif | |
26 | 26 |
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | $NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $ | 1 | $NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- qmake/Makefile.unix.orig 2009-02-25 22:09:16.000000000 +0100 | 3 | --- qmake/Makefile.unix.orig 2010-01-15 17:01:30.000000000 +0000 | |
4 | +++ qmake/Makefile.unix | 4 | +++ qmake/Makefile.unix | |
5 | @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ | 5 | @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ | |
6 | QTOBJS = @QMAKE_QTOBJS@ | 6 | QTOBJS = @QMAKE_QTOBJS@ | |
7 | QTSRCS = @QMAKE_QTSRCS@ | 7 | QTSRCS = @QMAKE_QTSRCS@ | |
8 | QMAKESPEC = @QMAKESPEC@ | 8 | QMAKESPEC = @QMAKESPEC@ | |
9 | -LFLAGS = @QMAKE_LFLAGS@ | 9 | -LFLAGS = @QMAKE_LFLAGS@ | |
10 | +LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS} | 10 | +LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS} | |
11 | 11 | |||
12 | #qmake code | 12 | #qmake code | |
13 | OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ | 13 | OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ | |
14 | @@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta | 14 | @@ -59,7 +59,7 @@ DEPEND_SRC=project.cpp property.cpp meta | |
15 | $(SOURCE_PATH)/src/script/qscriptstring.cpp \ | 15 | $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ | |
16 | $(QTSRCS) | 16 | $(QTSRCS) | |
17 | 17 | |||
18 | -CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ | 18 | -CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ | |
19 | +CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ | 19 | +CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ | |
20 | -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ | 20 | -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ | |
21 | -I$(BUILD_PATH)/src/corelib/global \ | 21 | -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ | |
22 | -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \ | 22 | -DQT_NO_PCRE \ | |
23 | @@ -97,7 +97,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators | 23 | @@ -68,7 +68,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators | |
24 | -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ | 24 | -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ | |
25 | -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) | 25 | -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) | |
26 | 26 | |||
27 | -CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) | 27 | -CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) | |
28 | +CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS) | 28 | +CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS) | |
29 | 29 | |||
30 | first all: $(BUILD_PATH)/bin/qmake | 30 | first all: $(BUILD_PATH)/bin/qmake | |
31 | qmake: $(BUILD_PATH)/bin/qmake | 31 | qmake: $(BUILD_PATH)/bin/qmake |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
1 | $NetBSD: patch-al,v 1.6 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-al,v 1.7 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/corelib/io/qsettings.cpp.orig 2009-09-29 13:01:37.000000000 +0200 | 3 | --- src/corelib/io/qsettings.cpp.orig 2010-01-15 17:01:36.000000000 +0000 | |
4 | +++ src/corelib/io/qsettings.cpp | 4 | +++ src/corelib/io/qsettings.cpp | |
5 | @@ -132,9 +132,16 @@ QT_END_INCLUDE_NAMESPACE | 5 | @@ -136,9 +136,16 @@ QT_END_INCLUDE_NAMESPACE | |
6 | 6 | |||
7 | static bool isLikelyToBeNfs(int handle) | 7 | static bool isLikelyToBeNfs(int handle) | |
8 | { | 8 | { | |
9 | +#ifdef QT_STATVFS | 9 | +#ifdef QT_STATVFS | |
10 | + struct statvfs buf; | 10 | + struct statvfs buf; | |
11 | + if (fstatvfs(handle, &buf) != 0) | 11 | + if (fstatvfs(handle, &buf) != 0) | |
12 | + return false; | 12 | + return false; | |
13 | +#else | 13 | +#else | |
14 | struct statfs buf; | 14 | struct statfs buf; | |
15 | if (fstatfs(handle, &buf) != 0) | 15 | if (fstatfs(handle, &buf) != 0) | |
16 | return false; | 16 | return false; | |
17 | +#endif | 17 | +#endif | |
18 | + | 18 | + | |
19 | return qt_isEvilFsTypeName(buf.f_fstypename); | 19 | return qt_isEvilFsTypeName(buf.f_fstypename); | |
20 | } | 20 | } | |
21 | 21 | |||
22 | @@ -168,7 +175,7 @@ static bool isLikelyToBeNfs(int handle) | 22 | @@ -172,7 +179,7 @@ static bool isLikelyToBeNfs(int handle) | |
23 | 23 | |||
24 | #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \ | 24 | #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \ | |
25 | || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \ | 25 | || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_SCO) \ | |
26 | - || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD) | 26 | - || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD) | |
27 | + || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) | 27 | + || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) | |
28 | QT_BEGIN_INCLUDE_NAMESPACE | 28 | QT_BEGIN_INCLUDE_NAMESPACE | |
29 | # include <sys/statvfs.h> | 29 | # include <sys/statvfs.h> | |
30 | QT_END_INCLUDE_NAMESPACE | 30 | QT_END_INCLUDE_NAMESPACE |
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | $NetBSD: patch-an,v 1.6 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-an,v 1.7 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-09-29 13:01:37.000000000 +0200 | 3 | --- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2010-01-15 17:01:36.000000000 +0000 | |
4 | +++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 4 | +++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp | |
5 | @@ -41,7 +41,7 @@ | 5 | @@ -41,7 +41,7 @@ | |
6 | 6 | |||
7 | #include "qtconcurrentiteratekernel.h" | 7 | #include "qtconcurrentiteratekernel.h" | |
8 | 8 | |||
9 | -#if defined(Q_OS_MAC) | 9 | -#if defined(Q_OS_MAC) | |
10 | +#if defined(Q_OS_MAC) || defined(__APPLE__) | 10 | +#if defined(Q_OS_MAC) || defined(__APPLE__) | |
11 | ||||
12 | #include <mach/mach.h> | 11 | #include <mach/mach.h> | |
13 | #include <mach/mach_time.h> | 12 | #include <mach/mach_time.h> | |
14 | @@ -68,7 +68,7 @@ enum { | 13 | #include <unistd.h> | |
14 | @@ -67,7 +67,7 @@ enum { | |||
15 | MedianSize = 7 | 15 | MedianSize = 7 | |
16 | }; | 16 | }; | |
17 | 17 | |||
18 | -#if defined(Q_OS_MAC) | 18 | -#if defined(Q_OS_MAC) | |
19 | +#if defined(Q_OS_MAC) || defined(__APPLE__) | 19 | +#if defined(Q_OS_MAC) || defined(__APPLE__) | |
20 | 20 | |||
21 | static qint64 getticks() | 21 | static qint64 getticks() | |
22 | { | 22 | { |
@@ -1,63 +1,63 @@ | @@ -1,63 +1,63 @@ | |||
1 | $NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ | 1 | $NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100 | 3 | --- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 | |
4 | +++ src/corelib/codecs/qiconvcodec.cpp | 4 | +++ src/corelib/codecs/qiconvcodec.cpp | |
5 | @@ -50,9 +50,14 @@ | 5 | @@ -50,9 +50,14 @@ | |
6 | #include <stdio.h> | 6 | #include <stdio.h> | |
7 | #include <dlfcn.h> | 7 | #include <dlfcn.h> | |
8 | 8 | |||
9 | +// for __DragonFly_version | 9 | +// for __DragonFly_version | |
10 | +#if defined(__DragonFly__) | 10 | +#if defined(__DragonFly__) | |
11 | +#include <sys/param.h> | 11 | +#include <sys/param.h> | |
12 | +#endif | 12 | +#endif | |
13 | + | 13 | + | |
14 | // unistd.h is needed for the _XOPEN_UNIX macro | 14 | // unistd.h is needed for the _XOPEN_UNIX macro | |
15 | #include <unistd.h> | 15 | #include <unistd.h> | |
16 | -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) | 16 | -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) | |
17 | +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) | 17 | +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) | |
18 | # include <langinfo.h> | 18 | # include <langinfo.h> | |
19 | #endif | 19 | #endif | |
20 | 20 | |||
21 | @@ -69,6 +74,9 @@ | 21 | @@ -69,6 +74,9 @@ | |
22 | # else | 22 | # else | |
23 | # define UTF16 "UTF-16LE" | 23 | # define UTF16 "UTF-16LE" | |
24 | # endif | 24 | # endif | |
25 | +#elif defined(__DragonFly__) && __DragonFly_version__ < 197700 | 25 | +#elif defined(__DragonFly__) && __DragonFly_version__ < 197700 | |
26 | +# define NO_BOM | 26 | +# define NO_BOM | |
27 | +# define UTF16 "UTF-16" | 27 | +# define UTF16 "UTF-16" | |
28 | #else | 28 | #else | |
29 | # define UTF16 "UTF-16" | 29 | # define UTF16 "UTF-16" | |
30 | #endif | 30 | #endif | |
31 | @@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co | 31 | @@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co | |
32 | IconvState *state = *pstate; | 32 | IconvState *state = *pstate; | |
33 | size_t inBytesLeft = len; | 33 | size_t inBytesLeft = len; | |
34 | // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM | 34 | // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM | |
35 | -#ifdef GNU_LIBICONV | 35 | -#ifdef GNU_LIBICONV | |
36 | +#if defined(GNU_LIBICONV) || defined(__NetBSD__) | 36 | +#if defined(GNU_LIBICONV) || defined(__NetBSD__) | |
37 | // GNU doesn't disagree with POSIX :/ | 37 | // GNU doesn't disagree with POSIX :/ | |
38 | const char *inBytes = chars; | 38 | const char *inBytes = chars; | |
39 | #else | 39 | #else | |
40 | @@ -306,7 +314,7 @@ QByteArray QIconvCodec::convertFromUnico | 40 | @@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico | |
41 | char *outBytes; | 41 | char *outBytes; | |
42 | size_t inBytesLeft; | 42 | size_t inBytesLeft; | |
43 | 43 | |||
44 | -#if defined(GNU_LIBICONV) | 44 | -#if defined(GNU_LIBICONV) | |
45 | +#if defined(GNU_LIBICONV) || defined(__NetBSD__) | 45 | +#if defined(GNU_LIBICONV) || defined(__NetBSD__) | |
46 | const char **inBytesPtr = const_cast<const char **>(&inBytes); | 46 | const char **inBytesPtr = const_cast<const char **>(&inBytes); | |
47 | #else | 47 | #else | |
48 | char **inBytesPtr = &inBytes; | 48 | char **inBytesPtr = &inBytes; | |
49 | @@ -454,11 +462,13 @@ iconv_t QIconvCodec::createIconv_t(const | 49 | @@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const | |
50 | static const char empty_codeset[] = ""; | 50 | static const char empty_codeset[] = ""; | |
51 | const char *codeset = empty_codeset; | 51 | const char *codeset = empty_codeset; | |
52 | cd = iconv_open(to ? to : codeset, from ? from : codeset); | 52 | cd = iconv_open(to ? to : codeset, from ? from : codeset); | |
53 | +#elif defined(__NetBSD) | 53 | +#elif defined(__NetBSD) | |
54 | + const char *codeset = 0; | 54 | + const char *codeset = 0; | |
55 | #else | 55 | #else | |
56 | char *codeset = 0; | 56 | char *codeset = 0; | |
57 | #endif | 57 | #endif | |
58 | 58 | |||
59 | -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) | 59 | -#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) | |
60 | +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) | 60 | +#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) | |
61 | if (cd == (iconv_t) -1) { | 61 | if (cd == (iconv_t) -1) { | |
62 | codeset = nl_langinfo(CODESET); | 62 | codeset = nl_langinfo(CODESET); | |
63 | if (codeset) | 63 | if (codeset) |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ak,v 1.5 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ak,v 1.6 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/gui/kernel/qcursor_x11.cpp.orig 2009-09-29 13:01:37.000000000 +0200 | 3 | --- src/gui/kernel/qcursor_x11.cpp.orig 2010-01-15 17:01:35.000000000 +0000 | |
4 | +++ src/gui/kernel/qcursor_x11.cpp | 4 | +++ src/gui/kernel/qcursor_x11.cpp | |
5 | @@ -244,7 +244,7 @@ void QCursorData::update() | 5 | @@ -243,7 +243,7 @@ void QCursorData::update() | |
6 | return; | 6 | return; | |
7 | } | 7 | } | |
8 | 8 | |||
9 | - static const char *cursorNames[] = { | 9 | - static const char *cursorNames[] = { | |
10 | + static char *cursorNames[] = { | 10 | + static char *cursorNames[] = { | |
11 | "left_ptr", | 11 | "left_ptr", | |
12 | "up_arrow", | 12 | "up_arrow", | |
13 | "cross", | 13 | "cross", |
@@ -1,63 +1,22 @@ | @@ -1,63 +1,22 @@ | |||
1 | $NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2009-09-29 13:01:31.000000000 +0200 | 3 | --- configure.orig 2010-01-15 17:01:30.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -2798,7 +2798,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ | 5 | @@ -3069,7 +3069,7 @@ fi | |
6 | fi | 6 | if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then | |
7 | 7 | # get the darwin version. 10.0.0 and up means snow leopard. | ||
8 | #auto-detect DWARF2 on the mac | 8 | VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` | |
9 | -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then | 9 | - if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then | |
10 | +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then | 10 | + if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then | |
11 | if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then | 11 | echo | |
12 | CFG_MAC_DWARF2=no | 12 | echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " | |
13 | else | 13 | echo | |
14 | @@ -2807,7 +2807,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF | 14 | @@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" | |
15 | fi | |||
16 | ||||
17 | # auto-detect support for -Xarch on the mac | |||
18 | -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then | |||
19 | +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then | |||
20 | if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then | |||
21 | CFG_MAC_XARCH=no | |||
22 | else | |||
23 | @@ -5587,18 +5587,18 @@ fi | |||
24 | ||||
25 | # Set the default arch. Select 32-bit/carbon if nothing else has | |||
26 | # been specified on the configure line. | |||
27 | -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then | |||
28 | +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then | |||
29 | source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" | |||
30 | ||||
31 | - if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then | |||
32 | + if [ "$QT_MAC_DEFUALT_ARCH" = "x86_64" ]; then | |||
33 | CFG_MAC_ARCHS=" x86" | |||
34 | - elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then | |||
35 | + elif [ "$QT_MAC_DEFUALT_ARCH" = "ppc64" ]; then | |||
36 | CFG_MAC_ARCHS=" ppc" | |||
37 | else | |||
38 | CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" | |||
39 | fi | |||
40 | ||||
41 | - [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." | |||
42 | + [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." | |||
43 | fi | |||
44 | ||||
45 | # enable cocoa and/or carbon on Mac | |||
46 | @@ -6538,7 +6538,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" | |||
47 | [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" | 15 | [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" | |
48 | [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" | 16 | [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" | |
49 | [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" | 17 | [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" | |
50 | -[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" | 18 | -[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" | |
51 | +#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" | 19 | +#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" | |
52 | 20 | |||
53 | if [ "$PLATFORM_QWS" != "yes" ]; then | 21 | if [ "$PLATFORM_QWS" != "yes" ]; then | |
54 | [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" | 22 | [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" | |
55 | @@ -6856,7 +6856,7 @@ EOF | |||
56 | *) ;; | |||
57 | esac | |||
58 | ||||
59 | -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then | |||
60 | +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then | |||
61 | cat <<EOF | |||
62 | WARNING: DWARF2 debug symbols are not enabled. Linking webkit | |||
63 | in debug mode will run out of memory on systems with 2GB or less. |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ar,v 1.4 2009/10/11 09:14:52 adam Exp $ | 1 | $NetBSD: patch-ar,v 1.5 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/corelib/global/qglobal.h.orig 2009-10-05 09:36:44.000000000 +0200 | 3 | --- src/corelib/global/qglobal.h.orig 2010-01-27 13:03:02.000000000 +0000 | |
4 | +++ src/corelib/global/qglobal.h | 4 | +++ src/corelib/global/qglobal.h | |
5 | @@ -176,7 +176,7 @@ namespace QT_NAMESPACE {} | 5 | @@ -177,7 +177,7 @@ namespace QT_NAMESPACE {} | |
6 | */ | 6 | */ | |
7 | 7 | |||
8 | #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) | 8 | #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) | |
9 | -# define Q_OS_DARWIN | 9 | -# define Q_OS_DARWIN | |
10 | +/* # define Q_OS_DARWIN *//* Else it'll try to use MacOS, no X, stuff - HF */ | 10 | +/* # define Q_OS_DARWIN *//* Else it'll try to use MacOS, no X, stuff - HF */ | |
11 | # define Q_OS_BSD4 | 11 | # define Q_OS_BSD4 | |
12 | # ifdef __LP64__ | 12 | # ifdef __LP64__ | |
13 | # define Q_OS_DARWIN64 | 13 | # define Q_OS_DARWIN64 |
$NetBSD: patch-au,v 1.4 2010/01/29 18:19:09 adam Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-01-28 07:10:17.000000000 +0000
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
@@ -468,7 +468,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
}
inline JSValue::JSValue(const JSCell* ptr)
@@ -477,7 +477,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
}
inline JSValue::operator bool() const
$NetBSD: patch-aw,v 1.1 2010/01/29 18:19:09 adam Exp $
--- src/network/kernel/qhostinfo_unix.cpp.orig 2010-01-28 07:21:09.000000000 +0000
+++ src/network/kernel/qhostinfo_unix.cpp
@@ -116,6 +116,8 @@ static void resolveLibrary()
if (!local_res_nclose)
local_res_ninit = 0;
}
+ if (local_res_ninit)
+ local_res_init = 0;
#endif
}
@@ -1,14 +1,16 @@ | @@ -1,14 +1,16 @@ | |||
1 | $NetBSD: patch-ax,v 1.1 2009/06/13 11:55:51 hasso Exp $ | 1 | $NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | --- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig 2009-04-22 02:57:38 +0300 | 3 | --- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-01-28 06:27:43.000000000 +0000 | |
4 | +++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2009-05-01 19:45:48 +0300 | 4 | +++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp | |
5 | @@ -76,9 +76,7 @@ extern int *__libc_stack_end; | 5 | @@ -252,7 +252,11 @@ int WebSocketHandshake::readServerHandsh | |
6 | #include <thread.h> | 6 | p += sizeof(webSocketConnectionHeader) - 1; | |
7 | #endif | 7 | } | |
8 | 8 | |||
9 | -#if PLATFORM(OPENBSD) | 9 | +#if defined(__NetBSD__) | |
10 | #include <pthread.h> | 10 | + if (!strstr(p, "\r\n\r\n")) { | |
11 | -#endif | 11 | +#else | |
12 | 12 | if (!strnstr(p, "\r\n\r\n", end - p)) { | ||
13 | #if HAVE(PTHREAD_NP_H) | 13 | +#endif | |
14 | #include <pthread_np.h> | 14 | // Just hasn't been received fully yet. | |
15 | return -1; | |||
16 | } |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-mysql-${QTVERSION} | 7 | PKGNAME= qt4-mysql-${QTVERSION} | |
8 | PKGREVISION= 1 | |||
9 | COMMENT= QT mysql driver | 8 | COMMENT= QT mysql driver | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= -I${QTDIR}/include | 10 | CONFIGURE_ARGS+= -I${QTDIR}/include | |
12 | CONFIGURE_ARGS+= -L${QTDIR}/lib | 11 | CONFIGURE_ARGS+= -L${QTDIR}/lib | |
13 | 12 | |||
14 | BUILD_QT4= yes | 13 | BUILD_QT4= yes | |
15 | 14 | |||
16 | do-build: | 15 | do-build: | |
17 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | 16 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | |
18 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | 17 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | |
19 | cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} | 18 | cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} | |
20 | 19 | |||
21 | SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers | 20 | SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-pgsql-${QTVERSION} | 7 | PKGNAME= qt4-pgsql-${QTVERSION} | |
8 | PKGREVISION= 1 | |||
9 | COMMENT= QT postgresql driver | 8 | COMMENT= QT postgresql driver | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= -I${QTDIR}/include | 10 | CONFIGURE_ARGS+= -I${QTDIR}/include | |
12 | CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server | 11 | CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server | |
13 | CONFIGURE_ARGS+= -L${QTDIR}/lib | 12 | CONFIGURE_ARGS+= -L${QTDIR}/lib | |
14 | 13 | |||
15 | BUILD_QT4= yes | 14 | BUILD_QT4= yes | |
16 | 15 | |||
17 | do-build: | 16 | do-build: | |
18 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | 17 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | |
19 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | 18 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | |
20 | cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} | 19 | cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} | |
21 | 20 |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.10 2010/01/18 09:59:43 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-qdbus-${QTVERSION} | 7 | PKGNAME= qt4-qdbus-${QTVERSION} | |
8 | PKGREVISION= 2 | |||
9 | COMMENT= QT DBus support | 8 | COMMENT= QT DBus support | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib | 10 | CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib | |
12 | CONFIGURE_ARGS+= -qdbus | 11 | CONFIGURE_ARGS+= -qdbus | |
13 | 12 | |||
14 | USE_TOOLS+= pkg-config | 13 | USE_TOOLS+= pkg-config | |
15 | 14 | |||
16 | BUILD_QT4= yes | 15 | BUILD_QT4= yes | |
17 | 16 | |||
18 | post-configure: | 17 | post-configure: | |
19 | ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc | 18 | ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc | |
20 | ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic | 19 | ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic | |
21 | ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc | 20 | ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc |
@@ -1,60 +1,64 @@ | @@ -1,60 +1,64 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.6 2009/10/17 22:57:45 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.7 2010/01/29 18:19:09 adam Exp $ | |
2 | lib/pkgconfig/QtDBus.pc | 2 | lib/pkgconfig/QtDBus.pc | |
3 | qt4/bin/qdbus | 3 | qt4/bin/qdbus | |
4 | qt4/bin/qdbuscpp2xml | 4 | qt4/bin/qdbuscpp2xml | |
5 | qt4/bin/qdbusviewer | 5 | qt4/bin/qdbusviewer | |
6 | qt4/bin/qdbusxml2cpp | 6 | qt4/bin/qdbusxml2cpp | |
7 | qt4/include/Qt/QtDBus | 7 | qt4/include/Qt/QtDBus | |
8 | qt4/include/Qt/qdbusabstractadaptor.h | 8 | qt4/include/Qt/qdbusabstractadaptor.h | |
9 | qt4/include/Qt/qdbusabstractinterface.h | 9 | qt4/include/Qt/qdbusabstractinterface.h | |
10 | qt4/include/Qt/qdbusargument.h | 10 | qt4/include/Qt/qdbusargument.h | |
11 | qt4/include/Qt/qdbusconnection.h | 11 | qt4/include/Qt/qdbusconnection.h | |
12 | qt4/include/Qt/qdbusconnectioninterface.h | 12 | qt4/include/Qt/qdbusconnectioninterface.h | |
13 | qt4/include/Qt/qdbuscontext.h | 13 | qt4/include/Qt/qdbuscontext.h | |
14 | qt4/include/Qt/qdbuserror.h | 14 | qt4/include/Qt/qdbuserror.h | |
15 | qt4/include/Qt/qdbusextratypes.h | 15 | qt4/include/Qt/qdbusextratypes.h | |
16 | qt4/include/Qt/qdbusinterface.h | 16 | qt4/include/Qt/qdbusinterface.h | |
17 | qt4/include/Qt/qdbusmacros.h | 17 | qt4/include/Qt/qdbusmacros.h | |
18 | qt4/include/Qt/qdbusmessage.h | 18 | qt4/include/Qt/qdbusmessage.h | |
19 | qt4/include/Qt/qdbusmetatype.h | 19 | qt4/include/Qt/qdbusmetatype.h | |
20 | qt4/include/Qt/qdbuspendingcall.h | 20 | qt4/include/Qt/qdbuspendingcall.h | |
21 | qt4/include/Qt/qdbuspendingreply.h | 21 | qt4/include/Qt/qdbuspendingreply.h | |
22 | qt4/include/Qt/qdbusreply.h | 22 | qt4/include/Qt/qdbusreply.h | |
23 | qt4/include/Qt/qdbusserver.h | 23 | qt4/include/Qt/qdbusserver.h | |
24 | qt4/include/Qt/qdbusservicewatcher.h | |||
24 | qt4/include/QtDBus/QDBusAbstractAdaptor | 25 | qt4/include/QtDBus/QDBusAbstractAdaptor | |
25 | qt4/include/QtDBus/QDBusAbstractInterface | 26 | qt4/include/QtDBus/QDBusAbstractInterface | |
27 | qt4/include/QtDBus/QDBusAbstractInterfaceBase | |||
26 | qt4/include/QtDBus/QDBusArgument | 28 | qt4/include/QtDBus/QDBusArgument | |
27 | qt4/include/QtDBus/QDBusConnection | 29 | qt4/include/QtDBus/QDBusConnection | |
28 | qt4/include/QtDBus/QDBusConnectionInterface | 30 | qt4/include/QtDBus/QDBusConnectionInterface | |
29 | qt4/include/QtDBus/QDBusContext | 31 | qt4/include/QtDBus/QDBusContext | |
30 | qt4/include/QtDBus/QDBusError | 32 | qt4/include/QtDBus/QDBusError | |
31 | qt4/include/QtDBus/QDBusInterface | 33 | qt4/include/QtDBus/QDBusInterface | |
32 | qt4/include/QtDBus/QDBusMessage | 34 | qt4/include/QtDBus/QDBusMessage | |
33 | qt4/include/QtDBus/QDBusMetaType | 35 | qt4/include/QtDBus/QDBusMetaType | |
34 | qt4/include/QtDBus/QDBusObjectPath | 36 | qt4/include/QtDBus/QDBusObjectPath | |
35 | qt4/include/QtDBus/QDBusPendingCall | 37 | qt4/include/QtDBus/QDBusPendingCall | |
36 | qt4/include/QtDBus/QDBusPendingCallWatcher | 38 | qt4/include/QtDBus/QDBusPendingCallWatcher | |
37 | qt4/include/QtDBus/QDBusPendingReply | 39 | qt4/include/QtDBus/QDBusPendingReply | |
38 | qt4/include/QtDBus/QDBusPendingReplyData | 40 | qt4/include/QtDBus/QDBusPendingReplyData | |
39 | qt4/include/QtDBus/QDBusReply | 41 | qt4/include/QtDBus/QDBusReply | |
40 | qt4/include/QtDBus/QDBusServer | 42 | qt4/include/QtDBus/QDBusServer | |
43 | qt4/include/QtDBus/QDBusServiceWatcher | |||
41 | qt4/include/QtDBus/QDBusSignature | 44 | qt4/include/QtDBus/QDBusSignature | |
42 | qt4/include/QtDBus/QDBusVariant | 45 | qt4/include/QtDBus/QDBusVariant | |
43 | qt4/include/QtDBus/QtDBus | 46 | qt4/include/QtDBus/QtDBus | |
44 | qt4/include/QtDBus/qdbusabstractadaptor.h | 47 | qt4/include/QtDBus/qdbusabstractadaptor.h | |
45 | qt4/include/QtDBus/qdbusabstractinterface.h | 48 | qt4/include/QtDBus/qdbusabstractinterface.h | |
46 | qt4/include/QtDBus/qdbusargument.h | 49 | qt4/include/QtDBus/qdbusargument.h | |
47 | qt4/include/QtDBus/qdbusconnection.h | 50 | qt4/include/QtDBus/qdbusconnection.h | |
48 | qt4/include/QtDBus/qdbusconnectioninterface.h | 51 | qt4/include/QtDBus/qdbusconnectioninterface.h | |
49 | qt4/include/QtDBus/qdbuscontext.h | 52 | qt4/include/QtDBus/qdbuscontext.h | |
50 | qt4/include/QtDBus/qdbuserror.h | 53 | qt4/include/QtDBus/qdbuserror.h | |
51 | qt4/include/QtDBus/qdbusextratypes.h | 54 | qt4/include/QtDBus/qdbusextratypes.h | |
52 | qt4/include/QtDBus/qdbusinterface.h | 55 | qt4/include/QtDBus/qdbusinterface.h | |
53 | qt4/include/QtDBus/qdbusmacros.h | 56 | qt4/include/QtDBus/qdbusmacros.h | |
54 | qt4/include/QtDBus/qdbusmessage.h | 57 | qt4/include/QtDBus/qdbusmessage.h | |
55 | qt4/include/QtDBus/qdbusmetatype.h | 58 | qt4/include/QtDBus/qdbusmetatype.h | |
56 | qt4/include/QtDBus/qdbuspendingcall.h | 59 | qt4/include/QtDBus/qdbuspendingcall.h | |
57 | qt4/include/QtDBus/qdbuspendingreply.h | 60 | qt4/include/QtDBus/qdbuspendingreply.h | |
58 | qt4/include/QtDBus/qdbusreply.h | 61 | qt4/include/QtDBus/qdbusreply.h | |
59 | qt4/include/QtDBus/qdbusserver.h | 62 | qt4/include/QtDBus/qdbusserver.h | |
63 | qt4/include/QtDBus/qdbusservicewatcher.h | |||
60 | qt4/lib/libQtDBus.la | 64 | qt4/lib/libQtDBus.la |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2010/01/18 09:59:44 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-sqlite3-${QTVERSION} | 7 | PKGNAME= qt4-sqlite3-${QTVERSION} | |
8 | PKGREVISION= 1 | |||
9 | COMMENT= QT sqlite3 driver | 8 | COMMENT= QT sqlite3 driver | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= -I${QTDIR}/include | 10 | CONFIGURE_ARGS+= -I${QTDIR}/include | |
12 | CONFIGURE_ARGS+= -L${QTDIR}/lib | 11 | CONFIGURE_ARGS+= -L${QTDIR}/lib | |
13 | CONFIGURE_ARGS+= -system-sqlite | 12 | CONFIGURE_ARGS+= -system-sqlite | |
14 | 13 | |||
15 | BUILD_QT4= yes | 14 | BUILD_QT4= yes | |
16 | USE_TOOLS+= pkg-config | 15 | USE_TOOLS+= pkg-config | |
17 | 16 | |||
18 | do-build: | 17 | do-build: | |
19 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | 18 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | |
20 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | 19 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | |
21 | cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} | 20 | cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2010/01/18 09:59:44 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-tiff-${QTVERSION} | 7 | PKGNAME= qt4-tiff-${QTVERSION} | |
8 | PKGREVISION= 1 | |||
9 | COMMENT= QT TIFF image format plugin | 8 | COMMENT= QT TIFF image format plugin | |
10 | 9 | |||
11 | CONFIGURE_ARGS+= -I${QTDIR}/include | 10 | CONFIGURE_ARGS+= -I${QTDIR}/include | |
12 | CONFIGURE_ARGS+= -L${QTDIR}/lib | 11 | CONFIGURE_ARGS+= -L${QTDIR}/lib | |
13 | 12 | |||
14 | BUILD_QT4= yes | 13 | BUILD_QT4= yes | |
15 | 14 | |||
16 | do-build: | 15 | do-build: | |
17 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | 16 | cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} | |
18 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | 17 | cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} | |
19 | cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} | 18 | cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} | |
20 | 19 | |||
21 | IMGFMTDIR= ${QTPREFIX}/plugins/imageformats | 20 | IMGFMTDIR= ${QTPREFIX}/plugins/imageformats |
@@ -1,66 +1,73 @@ | @@ -1,66 +1,73 @@ | |||
1 | # $NetBSD: Makefile,v 1.28 2010/01/18 09:59:44 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.29 2010/01/29 18:19:09 adam Exp $ | |
2 | 2 | |||
3 | PKG_DESTDIR_SUPPORT= user-destdir | 3 | PKG_DESTDIR_SUPPORT= user-destdir | |
4 | 4 | |||
5 | .include "../../x11/qt4-libs/Makefile.common" | 5 | .include "../../x11/qt4-libs/Makefile.common" | |
6 | 6 | |||
7 | PKGNAME= qt4-tools-${QTVERSION} | 7 | PKGNAME= qt4-tools-${QTVERSION} | |
8 | PKGREVISION= 2 | |||
9 | COMMENT= QT GUI (WYSIWYG) builder and other tools | 8 | COMMENT= QT GUI (WYSIWYG) builder and other tools | |
10 | 9 | |||
11 | DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base | 10 | DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base | |
12 | 11 | |||
13 | CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib | 12 | CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib | |
14 | CONFIGURE_ARGS+= -DQT_NO_DBUS | 13 | CONFIGURE_ARGS+= -DQT_NO_DBUS | |
15 | 14 | |||
16 | BUILD_TARGET= sub-tools sub-tools-qdoc3 | 15 | # XXX this is to test what really gets installed when 'do-install' is disabled | |
16 | INSTALL_DIRS+= tools | |||
17 | ||||
18 | BUILD_TARGET= sub-tools-bootstrap sub-tools | |||
17 | 19 | |||
18 | BUILD_QT4= yes | 20 | BUILD_QT4= yes | |
19 | UNLIMIT_RESOURCES= datasize | 21 | UNLIMIT_RESOURCES= datasize | |
20 | 22 | |||
21 | INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \ | 23 | INSTALLATION_DIRS= lib/pkgconfig | |
22 | ${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \ | 24 | INSTALLATION_DIRS+= ${QTPREFIX}/bin | |
23 | ${QTPREFIX}/mkspecs ${QTPREFIX}/tools/qdoc3 | 25 | INSTALLATION_DIRS+= ${QTPREFIX}/lib | |
26 | INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks | |||
27 | INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer | |||
28 | INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs | |||
29 | INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 | |||
24 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} | 30 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} | |
25 | 31 | |||
26 | post-configure: | 32 | post-configure: | |
27 | ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc | 33 | ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc | |
28 | ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic | 34 | ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic | |
29 | ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc | 35 | ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc | |
30 | 36 | |||
31 | do-install: | 37 | do-install: | |
32 | .for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4 | 38 | .for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4 | |
33 | ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ | 39 | ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ | |
34 | .endfor | 40 | .endfor | |
35 | .for prog in assistant designer linguist qtconfig qhelpconverter \ | 41 | .for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \ | |
36 | qhelpgenerator qcollectiongenerator | 42 | qhelpgenerator qcollectiongenerator | |
37 | ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ | 43 | ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ | |
38 | ${DESTDIR}${QTPREFIX}/bin | 44 | ${DESTDIR}${QTPREFIX}/bin | |
39 | .endfor | 45 | .endfor | |
40 | ${INSTALL_PROGRAM} ${WRKSRC}/tools/qdoc3/qdoc3 \ | |||
41 | ${DESTDIR}${QTPREFIX}/tools/qdoc3/ | |||
42 | cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | 46 | cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | |
43 | ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers | 47 | ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers | |
44 | cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | 48 | cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | |
45 | ${MAKE_PROGRAM} install_assistant_headers | 49 | ${MAKE_PROGRAM} install_assistant_headers | |
46 | cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | 50 | cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ | |
47 | ${MAKE_PROGRAM} install_designer_headers | 51 | ${MAKE_PROGRAM} install_designer_headers | |
48 | cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \ | 52 | cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \ | |
49 | ${MAKE_PROGRAM} install_quitools_headers | 53 | ${MAKE_PROGRAM} install_quitools_headers | |
50 | .for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools | 54 | .for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools | |
51 | ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ | 55 | ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ | |
52 | ${DESTDIR}${QTPREFIX}/lib/ | 56 | ${DESTDIR}${QTPREFIX}/lib/ | |
53 | sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ | 57 | sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ | |
54 | ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc | 58 | ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc | |
55 | ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ | 59 | ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ | |
56 | .endfor | 60 | .endfor | |
57 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | 61 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |
58 | ${WRKSRC}/plugins/designer/libqt3supportwidgets.la \ | 62 | ${WRKSRC}/plugins/designer/libqt3supportwidgets.la \ | |
59 | ${DESTDIR}${QTPREFIX}/plugins/designer/ | 63 | ${DESTDIR}${QTPREFIX}/plugins/designer/ | |
64 | ${LIBTOOL} --mode=install ${INSTALL_LIB} \ | |||
65 | ${WRKSRC}/plugins/designer/libqwebview.la \ | |||
66 | ${DESTDIR}${QTPREFIX}/plugins/designer/ | |||
60 | ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ | 67 | ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ | |
61 | ${DESTDIR}${QTPREFIX}/phrasebooks/ | 68 | ${DESTDIR}${QTPREFIX}/phrasebooks/ | |
62 | cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} | 69 | cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} | |
63 | 70 | |||
64 | .include "../../converters/libiconv/buildlink3.mk" | 71 | .include "../../converters/libiconv/buildlink3.mk" | |
65 | .include "../../x11/qt4-libs/buildlink3.mk" | 72 | .include "../../x11/qt4-libs/buildlink3.mk" | |
66 | .include "../../mk/bsd.pkg.mk" | 73 | .include "../../mk/bsd.pkg.mk" |
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.19 2009/10/17 23:32:52 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.20 2010/01/29 18:19:10 adam Exp $ | |
2 | lib/pkgconfig/QtAssistantClient.pc | 2 | lib/pkgconfig/QtAssistantClient.pc | |
3 | lib/pkgconfig/QtCLucene.pc | 3 | lib/pkgconfig/QtCLucene.pc | |
4 | lib/pkgconfig/QtDesigner.pc | 4 | lib/pkgconfig/QtDesigner.pc | |
5 | lib/pkgconfig/QtDesignerComponents.pc | 5 | lib/pkgconfig/QtDesignerComponents.pc | |
6 | lib/pkgconfig/QtHelp.pc | 6 | lib/pkgconfig/QtHelp.pc | |
7 | lib/pkgconfig/QtUiTools.pc | 7 | lib/pkgconfig/QtUiTools.pc | |
8 | qt4/bin/assistant | 8 | qt4/bin/assistant | |
9 | qt4/bin/assistant_adp | 9 | qt4/bin/assistant_adp | |
10 | qt4/bin/designer | 10 | qt4/bin/designer | |
11 | qt4/bin/linguist | 11 | qt4/bin/linguist | |
12 | qt4/bin/lrelease | 12 | qt4/bin/lrelease | |
13 | qt4/bin/lupdate | 13 | qt4/bin/lupdate | |
14 | qt4/bin/pixeltool | 14 | qt4/bin/pixeltool | |
15 | qt4/bin/qcollectiongenerator | 15 | qt4/bin/qcollectiongenerator | |
16 | qt4/bin/qdoc3 | |||
16 | qt4/bin/qhelpconverter | 17 | qt4/bin/qhelpconverter | |
17 | qt4/bin/qhelpgenerator | 18 | qt4/bin/qhelpgenerator | |
18 | qt4/bin/qmake | 19 | qt4/bin/qmake | |
19 | qt4/bin/qt3to4 | 20 | qt4/bin/qt3to4 | |
20 | qt4/bin/qtconfig | 21 | qt4/bin/qtconfig | |
21 | qt4/include/Qt/QtHelp | 22 | qt4/include/Qt/QtHelp | |
22 | qt4/include/Qt/qhelp_global.h | 23 | qt4/include/Qt/qhelp_global.h | |
23 | qt4/include/Qt/qhelpcontentwidget.h | 24 | qt4/include/Qt/qhelpcontentwidget.h | |
24 | qt4/include/Qt/qhelpengine.h | 25 | qt4/include/Qt/qhelpengine.h | |
25 | qt4/include/Qt/qhelpenginecore.h | 26 | qt4/include/Qt/qhelpenginecore.h | |
26 | qt4/include/Qt/qhelpindexwidget.h | 27 | qt4/include/Qt/qhelpindexwidget.h | |
27 | qt4/include/Qt/qhelpsearchengine.h | 28 | qt4/include/Qt/qhelpsearchengine.h | |
28 | qt4/include/Qt/qhelpsearchquerywidget.h | 29 | qt4/include/Qt/qhelpsearchquerywidget.h | |
@@ -146,43 +147,48 @@ qt4/mkspecs/aix-g++/qmake.conf | @@ -146,43 +147,48 @@ qt4/mkspecs/aix-g++/qmake.conf | |||
146 | qt4/mkspecs/aix-g++/qplatformdefs.h | 147 | qt4/mkspecs/aix-g++/qplatformdefs.h | |
147 | qt4/mkspecs/aix-xlc-64/qmake.conf | 148 | qt4/mkspecs/aix-xlc-64/qmake.conf | |
148 | qt4/mkspecs/aix-xlc-64/qplatformdefs.h | 149 | qt4/mkspecs/aix-xlc-64/qplatformdefs.h | |
149 | qt4/mkspecs/aix-xlc/qmake.conf | 150 | qt4/mkspecs/aix-xlc/qmake.conf | |
150 | qt4/mkspecs/aix-xlc/qplatformdefs.h | 151 | qt4/mkspecs/aix-xlc/qplatformdefs.h | |
151 | qt4/mkspecs/common/g++.conf | 152 | qt4/mkspecs/common/g++.conf | |
152 | qt4/mkspecs/common/linux.conf | 153 | qt4/mkspecs/common/linux.conf | |
153 | qt4/mkspecs/common/llvm.conf | 154 | qt4/mkspecs/common/llvm.conf | |
154 | qt4/mkspecs/common/mac-g++.conf | 155 | qt4/mkspecs/common/mac-g++.conf | |
155 | qt4/mkspecs/common/mac-llvm.conf | 156 | qt4/mkspecs/common/mac-llvm.conf | |
156 | qt4/mkspecs/common/mac.conf | 157 | qt4/mkspecs/common/mac.conf | |
157 | qt4/mkspecs/common/qmake.conf | 158 | qt4/mkspecs/common/qmake.conf | |
158 | qt4/mkspecs/common/qws.conf | 159 | qt4/mkspecs/common/qws.conf | |
160 | qt4/mkspecs/common/symbian/qplatformdefs.h | |||
161 | qt4/mkspecs/common/symbian/stl-off/new | |||
162 | qt4/mkspecs/common/symbian/symbian.conf | |||
159 | qt4/mkspecs/common/unix.conf | 163 | qt4/mkspecs/common/unix.conf | |
160 | qt4/mkspecs/common/wince.conf | 164 | qt4/mkspecs/common/wince/qmake.conf | |
165 | qt4/mkspecs/common/wince/qplatformdefs.h | |||
161 | qt4/mkspecs/cygwin-g++/qmake.conf | 166 | qt4/mkspecs/cygwin-g++/qmake.conf | |
162 | qt4/mkspecs/cygwin-g++/qplatformdefs.h | 167 | qt4/mkspecs/cygwin-g++/qplatformdefs.h | |
163 | qt4/mkspecs/darwin-g++/qmake.conf | 168 | qt4/mkspecs/darwin-g++/qmake.conf | |
164 | qt4/mkspecs/darwin-g++/qplatformdefs.h | 169 | qt4/mkspecs/darwin-g++/qplatformdefs.h | |
165 | qt4/mkspecs/default | 170 | qt4/mkspecs/default | |
166 | qt4/mkspecs/features/assistant.prf | 171 | qt4/mkspecs/features/assistant.prf | |
167 | qt4/mkspecs/features/build_pass.prf | 172 | qt4/mkspecs/features/build_pass.prf | |
168 | qt4/mkspecs/features/dbusadaptors.prf | 173 | qt4/mkspecs/features/dbusadaptors.prf | |
169 | qt4/mkspecs/features/dbusinterfaces.prf | 174 | qt4/mkspecs/features/dbusinterfaces.prf | |
170 | qt4/mkspecs/features/debug.prf | 175 | qt4/mkspecs/features/debug.prf | |
171 | qt4/mkspecs/features/debug_and_release.prf | 176 | qt4/mkspecs/features/debug_and_release.prf | |
172 | qt4/mkspecs/features/default_post.prf | 177 | qt4/mkspecs/features/default_post.prf | |
173 | qt4/mkspecs/features/default_pre.prf | 178 | qt4/mkspecs/features/default_pre.prf | |
174 | qt4/mkspecs/features/designer.prf | 179 | qt4/mkspecs/features/designer.prf | |
175 | qt4/mkspecs/features/dll.prf | 180 | qt4/mkspecs/features/dll.prf | |
181 | qt4/mkspecs/features/egl.prf | |||
176 | qt4/mkspecs/features/exclusive_builds.prf | 182 | qt4/mkspecs/features/exclusive_builds.prf | |
177 | qt4/mkspecs/features/help.prf | 183 | qt4/mkspecs/features/help.prf | |
178 | qt4/mkspecs/features/include_source_dir.prf | 184 | qt4/mkspecs/features/include_source_dir.prf | |
179 | qt4/mkspecs/features/incredibuild_xge.prf | 185 | qt4/mkspecs/features/incredibuild_xge.prf | |
180 | qt4/mkspecs/features/lex.prf | 186 | qt4/mkspecs/features/lex.prf | |
181 | qt4/mkspecs/features/link_pkgconfig.prf | 187 | qt4/mkspecs/features/link_pkgconfig.prf | |
182 | qt4/mkspecs/features/mac/default_post.prf | 188 | qt4/mkspecs/features/mac/default_post.prf | |
183 | qt4/mkspecs/features/mac/default_pre.prf | 189 | qt4/mkspecs/features/mac/default_pre.prf | |
184 | qt4/mkspecs/features/mac/dwarf2.prf | 190 | qt4/mkspecs/features/mac/dwarf2.prf | |
185 | qt4/mkspecs/features/mac/objective_c.prf | 191 | qt4/mkspecs/features/mac/objective_c.prf | |
186 | qt4/mkspecs/features/mac/ppc.prf | 192 | qt4/mkspecs/features/mac/ppc.prf | |
187 | qt4/mkspecs/features/mac/ppc64.prf | 193 | qt4/mkspecs/features/mac/ppc64.prf | |
188 | qt4/mkspecs/features/mac/rez.prf | 194 | qt4/mkspecs/features/mac/rez.prf | |
@@ -197,52 +203,66 @@ qt4/mkspecs/features/qt.prf | @@ -197,52 +203,66 @@ qt4/mkspecs/features/qt.prf | |||
197 | qt4/mkspecs/features/qt_config.prf | 203 | qt4/mkspecs/features/qt_config.prf | |
198 | qt4/mkspecs/features/qt_functions.prf | 204 | qt4/mkspecs/features/qt_functions.prf | |
199 | qt4/mkspecs/features/qtestlib.prf | 205 | qt4/mkspecs/features/qtestlib.prf | |
200 | qt4/mkspecs/features/qtopia.prf | 206 | qt4/mkspecs/features/qtopia.prf | |
201 | qt4/mkspecs/features/qtopiainc.prf | 207 | qt4/mkspecs/features/qtopiainc.prf | |
202 | qt4/mkspecs/features/qtopialib.prf | 208 | qt4/mkspecs/features/qtopialib.prf | |
203 | qt4/mkspecs/features/release.prf | 209 | qt4/mkspecs/features/release.prf | |
204 | qt4/mkspecs/features/resources.prf | 210 | qt4/mkspecs/features/resources.prf | |
205 | qt4/mkspecs/features/shared.prf | 211 | qt4/mkspecs/features/shared.prf | |
206 | qt4/mkspecs/features/silent.prf | 212 | qt4/mkspecs/features/silent.prf | |
207 | qt4/mkspecs/features/static.prf | 213 | qt4/mkspecs/features/static.prf | |
208 | qt4/mkspecs/features/static_and_shared.prf | 214 | qt4/mkspecs/features/static_and_shared.prf | |
209 | qt4/mkspecs/features/staticlib.prf | 215 | qt4/mkspecs/features/staticlib.prf | |
216 | qt4/mkspecs/features/symbian/application_icon.prf | |||
217 | qt4/mkspecs/features/symbian/armcc_warnings.prf | |||
218 | qt4/mkspecs/features/symbian/data_caging_paths.prf | |||
219 | qt4/mkspecs/features/symbian/default_post.prf | |||
220 | qt4/mkspecs/features/symbian/default_pre.prf | |||
221 | qt4/mkspecs/features/symbian/epocallowdlldata.prf | |||
222 | qt4/mkspecs/features/symbian/moc.prf | |||
223 | qt4/mkspecs/features/symbian/platform_paths.prf | |||
224 | qt4/mkspecs/features/symbian/qt.prf | |||
225 | qt4/mkspecs/features/symbian/stl.prf | |||
226 | qt4/mkspecs/features/symbian/stl_off.prf | |||
210 | qt4/mkspecs/features/uic.prf | 227 | qt4/mkspecs/features/uic.prf | |
211 | qt4/mkspecs/features/uitools.prf | 228 | qt4/mkspecs/features/uitools.prf | |
212 | qt4/mkspecs/features/unix/bsymbolic_functions.prf | 229 | qt4/mkspecs/features/unix/bsymbolic_functions.prf | |
213 | qt4/mkspecs/features/unix/dylib.prf | 230 | qt4/mkspecs/features/unix/dylib.prf | |
214 | qt4/mkspecs/features/unix/hide_symbols.prf | 231 | qt4/mkspecs/features/unix/hide_symbols.prf | |
215 | qt4/mkspecs/features/unix/largefile.prf | 232 | qt4/mkspecs/features/unix/largefile.prf | |
216 | qt4/mkspecs/features/unix/opengl.prf | 233 | qt4/mkspecs/features/unix/opengl.prf | |
234 | qt4/mkspecs/features/unix/openvg.prf | |||
217 | qt4/mkspecs/features/unix/separate_debug_info.prf | 235 | qt4/mkspecs/features/unix/separate_debug_info.prf | |
218 | qt4/mkspecs/features/unix/thread.prf | 236 | qt4/mkspecs/features/unix/thread.prf | |
219 | qt4/mkspecs/features/unix/x11.prf | 237 | qt4/mkspecs/features/unix/x11.prf | |
220 | qt4/mkspecs/features/unix/x11inc.prf | 238 | qt4/mkspecs/features/unix/x11inc.prf | |
221 | qt4/mkspecs/features/unix/x11lib.prf | 239 | qt4/mkspecs/features/unix/x11lib.prf | |
222 | qt4/mkspecs/features/unix/x11sm.prf | 240 | qt4/mkspecs/features/unix/x11sm.prf | |
223 | qt4/mkspecs/features/use_c_linker.prf | 241 | qt4/mkspecs/features/use_c_linker.prf | |
242 | qt4/mkspecs/features/vxworks.prf | |||
224 | qt4/mkspecs/features/warn_off.prf | 243 | qt4/mkspecs/features/warn_off.prf | |
225 | qt4/mkspecs/features/warn_on.prf | 244 | qt4/mkspecs/features/warn_on.prf | |
226 | qt4/mkspecs/features/win32/console.prf | 245 | qt4/mkspecs/features/win32/console.prf | |
227 | qt4/mkspecs/features/win32/default_post.prf | 246 | qt4/mkspecs/features/win32/default_post.prf | |
228 | qt4/mkspecs/features/win32/default_pre.prf | 247 | qt4/mkspecs/features/win32/default_pre.prf | |
229 | qt4/mkspecs/features/win32/dumpcpp.prf | 248 | qt4/mkspecs/features/win32/dumpcpp.prf | |
230 | qt4/mkspecs/features/win32/embed_manifest_dll.prf | 249 | qt4/mkspecs/features/win32/embed_manifest_dll.prf | |
231 | qt4/mkspecs/features/win32/embed_manifest_exe.prf | 250 | qt4/mkspecs/features/win32/embed_manifest_exe.prf | |
232 | qt4/mkspecs/features/win32/exceptions.prf | 251 | qt4/mkspecs/features/win32/exceptions.prf | |
233 | qt4/mkspecs/features/win32/exceptions_off.prf | 252 | qt4/mkspecs/features/win32/exceptions_off.prf | |
234 | qt4/mkspecs/features/win32/ltcg.prf | 253 | qt4/mkspecs/features/win32/ltcg.prf | |
235 | qt4/mkspecs/features/win32/opengl.prf | 254 | qt4/mkspecs/features/win32/opengl.prf | |
255 | qt4/mkspecs/features/win32/openvg.prf | |||
236 | qt4/mkspecs/features/win32/qaxcontainer.prf | 256 | qt4/mkspecs/features/win32/qaxcontainer.prf | |
237 | qt4/mkspecs/features/win32/qaxserver.prf | 257 | qt4/mkspecs/features/win32/qaxserver.prf | |
238 | qt4/mkspecs/features/win32/qt_dll.prf | 258 | qt4/mkspecs/features/win32/qt_dll.prf | |
239 | qt4/mkspecs/features/win32/rtti.prf | 259 | qt4/mkspecs/features/win32/rtti.prf | |
240 | qt4/mkspecs/features/win32/rtti_off.prf | 260 | qt4/mkspecs/features/win32/rtti_off.prf | |
241 | qt4/mkspecs/features/win32/stl.prf | 261 | qt4/mkspecs/features/win32/stl.prf | |
242 | qt4/mkspecs/features/win32/stl_off.prf | 262 | qt4/mkspecs/features/win32/stl_off.prf | |
243 | qt4/mkspecs/features/win32/thread.prf | 263 | qt4/mkspecs/features/win32/thread.prf | |
244 | qt4/mkspecs/features/win32/thread_off.prf | 264 | qt4/mkspecs/features/win32/thread_off.prf | |
245 | qt4/mkspecs/features/win32/windows.prf | 265 | qt4/mkspecs/features/win32/windows.prf | |
246 | qt4/mkspecs/features/yacc.prf | 266 | qt4/mkspecs/features/yacc.prf | |
247 | qt4/mkspecs/freebsd-g++/qmake.conf | 267 | qt4/mkspecs/freebsd-g++/qmake.conf | |
248 | qt4/mkspecs/freebsd-g++/qplatformdefs.h | 268 | qt4/mkspecs/freebsd-g++/qplatformdefs.h | |
@@ -278,48 +298,54 @@ qt4/mkspecs/irix-cc/qmake.conf | @@ -278,48 +298,54 @@ qt4/mkspecs/irix-cc/qmake.conf | |||
278 | qt4/mkspecs/irix-cc/qplatformdefs.h | 298 | qt4/mkspecs/irix-cc/qplatformdefs.h | |
279 | qt4/mkspecs/irix-g++-64/qmake.conf | 299 | qt4/mkspecs/irix-g++-64/qmake.conf | |
280 | qt4/mkspecs/irix-g++-64/qplatformdefs.h | 300 | qt4/mkspecs/irix-g++-64/qplatformdefs.h | |
281 | qt4/mkspecs/irix-g++/qmake.conf | 301 | qt4/mkspecs/irix-g++/qmake.conf | |
282 | qt4/mkspecs/irix-g++/qplatformdefs.h | 302 | qt4/mkspecs/irix-g++/qplatformdefs.h | |
283 | qt4/mkspecs/linux-cxx/qmake.conf | 303 | qt4/mkspecs/linux-cxx/qmake.conf | |
284 | qt4/mkspecs/linux-cxx/qplatformdefs.h | 304 | qt4/mkspecs/linux-cxx/qplatformdefs.h | |
285 | qt4/mkspecs/linux-ecc-64/qmake.conf | 305 | qt4/mkspecs/linux-ecc-64/qmake.conf | |
286 | qt4/mkspecs/linux-ecc-64/qplatformdefs.h | 306 | qt4/mkspecs/linux-ecc-64/qplatformdefs.h | |
287 | qt4/mkspecs/linux-g++-32/qmake.conf | 307 | qt4/mkspecs/linux-g++-32/qmake.conf | |
288 | qt4/mkspecs/linux-g++-32/qplatformdefs.h | 308 | qt4/mkspecs/linux-g++-32/qplatformdefs.h | |
289 | qt4/mkspecs/linux-g++-64/qmake.conf | 309 | qt4/mkspecs/linux-g++-64/qmake.conf | |
290 | qt4/mkspecs/linux-g++-64/qplatformdefs.h | 310 | qt4/mkspecs/linux-g++-64/qplatformdefs.h | |
311 | qt4/mkspecs/linux-g++-maemo/qmake.conf | |||
312 | qt4/mkspecs/linux-g++-maemo/qplatformdefs.h | |||
291 | qt4/mkspecs/linux-g++/qmake.conf | 313 | qt4/mkspecs/linux-g++/qmake.conf | |
292 | qt4/mkspecs/linux-g++/qplatformdefs.h | 314 | qt4/mkspecs/linux-g++/qplatformdefs.h | |
293 | qt4/mkspecs/linux-icc-32/qmake.conf | 315 | qt4/mkspecs/linux-icc-32/qmake.conf | |
294 | qt4/mkspecs/linux-icc-32/qplatformdefs.h | 316 | qt4/mkspecs/linux-icc-32/qplatformdefs.h | |
295 | qt4/mkspecs/linux-icc-64/qmake.conf | 317 | qt4/mkspecs/linux-icc-64/qmake.conf | |
296 | qt4/mkspecs/linux-icc-64/qplatformdefs.h | 318 | qt4/mkspecs/linux-icc-64/qplatformdefs.h | |
297 | qt4/mkspecs/linux-icc/qmake.conf | 319 | qt4/mkspecs/linux-icc/qmake.conf | |
298 | qt4/mkspecs/linux-icc/qplatformdefs.h | 320 | qt4/mkspecs/linux-icc/qplatformdefs.h | |
299 | qt4/mkspecs/linux-kcc/qmake.conf | 321 | qt4/mkspecs/linux-kcc/qmake.conf | |
300 | qt4/mkspecs/linux-kcc/qplatformdefs.h | 322 | qt4/mkspecs/linux-kcc/qplatformdefs.h | |
301 | qt4/mkspecs/linux-llvm/qmake.conf | 323 | qt4/mkspecs/linux-llvm/qmake.conf | |
302 | qt4/mkspecs/linux-llvm/qplatformdefs.h | 324 | qt4/mkspecs/linux-llvm/qplatformdefs.h | |
303 | qt4/mkspecs/linux-lsb-g++/qmake.conf | 325 | qt4/mkspecs/linux-lsb-g++/qmake.conf | |
304 | qt4/mkspecs/linux-lsb-g++/qplatformdefs.h | 326 | qt4/mkspecs/linux-lsb-g++/qplatformdefs.h | |
305 | qt4/mkspecs/linux-pgcc/qmake.conf | 327 | qt4/mkspecs/linux-pgcc/qmake.conf | |
306 | qt4/mkspecs/linux-pgcc/qplatformdefs.h | 328 | qt4/mkspecs/linux-pgcc/qplatformdefs.h | |
307 | qt4/mkspecs/lynxos-g++/qmake.conf | 329 | qt4/mkspecs/lynxos-g++/qmake.conf | |
308 | qt4/mkspecs/lynxos-g++/qplatformdefs.h | 330 | qt4/mkspecs/lynxos-g++/qplatformdefs.h | |
309 | qt4/mkspecs/macx-g++/Info.plist.app | 331 | qt4/mkspecs/macx-g++/Info.plist.app | |
310 | qt4/mkspecs/macx-g++/Info.plist.lib | 332 | qt4/mkspecs/macx-g++/Info.plist.lib | |
311 | qt4/mkspecs/macx-g++/qmake.conf | 333 | qt4/mkspecs/macx-g++/qmake.conf | |
312 | qt4/mkspecs/macx-g++/qplatformdefs.h | 334 | qt4/mkspecs/macx-g++/qplatformdefs.h | |
335 | qt4/mkspecs/macx-g++40/Info.plist.app | |||
336 | qt4/mkspecs/macx-g++40/Info.plist.lib | |||
337 | qt4/mkspecs/macx-g++40/qmake.conf | |||
338 | qt4/mkspecs/macx-g++40/qplatformdefs.h | |||
313 | qt4/mkspecs/macx-g++42/Info.plist.app | 339 | qt4/mkspecs/macx-g++42/Info.plist.app | |
314 | qt4/mkspecs/macx-g++42/Info.plist.lib | 340 | qt4/mkspecs/macx-g++42/Info.plist.lib | |
315 | qt4/mkspecs/macx-g++42/qmake.conf | 341 | qt4/mkspecs/macx-g++42/qmake.conf | |
316 | qt4/mkspecs/macx-g++42/qplatformdefs.h | 342 | qt4/mkspecs/macx-g++42/qplatformdefs.h | |
317 | qt4/mkspecs/macx-icc/qmake.conf | 343 | qt4/mkspecs/macx-icc/qmake.conf | |
318 | qt4/mkspecs/macx-icc/qplatformdefs.h | 344 | qt4/mkspecs/macx-icc/qplatformdefs.h | |
319 | qt4/mkspecs/macx-llvm/Info.plist.app | 345 | qt4/mkspecs/macx-llvm/Info.plist.app | |
320 | qt4/mkspecs/macx-llvm/Info.plist.lib | 346 | qt4/mkspecs/macx-llvm/Info.plist.lib | |
321 | qt4/mkspecs/macx-llvm/qmake.conf | 347 | qt4/mkspecs/macx-llvm/qmake.conf | |
322 | qt4/mkspecs/macx-llvm/qplatformdefs.h | 348 | qt4/mkspecs/macx-llvm/qplatformdefs.h | |
323 | qt4/mkspecs/macx-pbuilder/Info.plist.app | 349 | qt4/mkspecs/macx-pbuilder/Info.plist.app | |
324 | qt4/mkspecs/macx-pbuilder/qmake.conf | 350 | qt4/mkspecs/macx-pbuilder/qmake.conf | |
325 | qt4/mkspecs/macx-pbuilder/qplatformdefs.h | 351 | qt4/mkspecs/macx-pbuilder/qplatformdefs.h | |
@@ -348,65 +374,97 @@ qt4/mkspecs/qws/linux-dm7000-g++/qmake.c | @@ -348,65 +374,97 @@ qt4/mkspecs/qws/linux-dm7000-g++/qmake.c | |||
348 | qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h | 374 | qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h | |
349 | qt4/mkspecs/qws/linux-dm800-g++/qmake.conf | 375 | qt4/mkspecs/qws/linux-dm800-g++/qmake.conf | |
350 | qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h | 376 | qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h | |
351 | qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf | 377 | qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf | |
352 | qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h | 378 | qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h | |
353 | qt4/mkspecs/qws/linux-generic-g++/qmake.conf | 379 | qt4/mkspecs/qws/linux-generic-g++/qmake.conf | |
354 | qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h | 380 | qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h | |
355 | qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf | 381 | qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf | |
356 | qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h | 382 | qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h | |
357 | qt4/mkspecs/qws/linux-lsb-g++/qmake.conf | 383 | qt4/mkspecs/qws/linux-lsb-g++/qmake.conf | |
358 | qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h | 384 | qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h | |
359 | qt4/mkspecs/qws/linux-mips-g++/qmake.conf | 385 | qt4/mkspecs/qws/linux-mips-g++/qmake.conf | |
360 | qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h | 386 | qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h | |
361 | qt4/mkspecs/qws/linux-ppc-g++/qmake.conf | 387 | qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf | |
362 | qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h | 388 | qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h | |
363 | qt4/mkspecs/qws/linux-sh-g++/qmake.conf | 389 | qt4/mkspecs/qws/linux-sh-g++/qmake.conf | |
364 | qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h | 390 | qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h | |
365 | qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf | 391 | qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf | |
366 | qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h | 392 | qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h | |
367 | qt4/mkspecs/qws/linux-sharp-g++/qmake.conf | 393 | qt4/mkspecs/qws/linux-sharp-g++/qmake.conf | |
368 | qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h | 394 | qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h | |
369 | qt4/mkspecs/qws/linux-x86-g++/qmake.conf | 395 | qt4/mkspecs/qws/linux-x86-g++/qmake.conf | |
370 | qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h | 396 | qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h | |
371 | qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf | 397 | qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf | |
372 | qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h | 398 | qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h | |
373 | qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf | 399 | qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf | |
374 | qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h | 400 | qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h | |
375 | qt4/mkspecs/qws/macx-generic-g++/qmake.conf | 401 | qt4/mkspecs/qws/macx-generic-g++/qmake.conf | |
376 | qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h | 402 | qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h | |
377 | qt4/mkspecs/qws/qmake.conf | 403 | qt4/mkspecs/qws/qmake.conf | |
378 | qt4/mkspecs/qws/solaris-generic-g++/qmake.conf | 404 | qt4/mkspecs/qws/solaris-generic-g++/qmake.conf | |
379 | qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h | 405 | qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h | |
380 | qt4/mkspecs/sco-cc/qmake.conf | 406 | qt4/mkspecs/sco-cc/qmake.conf | |
381 | qt4/mkspecs/sco-cc/qplatformdefs.h | 407 | qt4/mkspecs/sco-cc/qplatformdefs.h | |
382 | qt4/mkspecs/sco-g++/qmake.conf | 408 | qt4/mkspecs/sco-g++/qmake.conf | |
383 | qt4/mkspecs/sco-g++/qplatformdefs.h | 409 | qt4/mkspecs/sco-g++/qplatformdefs.h | |
410 | qt4/mkspecs/solaris-cc-64-stlport/qmake.conf | |||
411 | qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h | |||
384 | qt4/mkspecs/solaris-cc-64/qmake.conf | 412 | qt4/mkspecs/solaris-cc-64/qmake.conf | |
385 | qt4/mkspecs/solaris-cc-64/qplatformdefs.h | 413 | qt4/mkspecs/solaris-cc-64/qplatformdefs.h | |
414 | qt4/mkspecs/solaris-cc-stlport/qmake.conf | |||
415 | qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h | |||
386 | qt4/mkspecs/solaris-cc/qmake.conf | 416 | qt4/mkspecs/solaris-cc/qmake.conf | |
387 | qt4/mkspecs/solaris-cc/qplatformdefs.h | 417 | qt4/mkspecs/solaris-cc/qplatformdefs.h | |
388 | qt4/mkspecs/solaris-g++-64/qmake.conf | 418 | qt4/mkspecs/solaris-g++-64/qmake.conf | |
389 | qt4/mkspecs/solaris-g++-64/qplatformdefs.h | 419 | qt4/mkspecs/solaris-g++-64/qplatformdefs.h | |
390 | qt4/mkspecs/solaris-g++/qmake.conf | 420 | qt4/mkspecs/solaris-g++/qmake.conf | |
391 | qt4/mkspecs/solaris-g++/qplatformdefs.h | 421 | qt4/mkspecs/solaris-g++/qplatformdefs.h | |
422 | qt4/mkspecs/symbian-abld/qmake.conf | |||
423 | qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | |||
424 | qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm | |||
425 | qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm | |||
426 | qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm | |||
427 | qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml | |||
428 | qt4/mkspecs/symbian-sbsv2/qmake.conf | |||
392 | qt4/mkspecs/tru64-cxx/qmake.conf | 429 | qt4/mkspecs/tru64-cxx/qmake.conf | |
393 | qt4/mkspecs/tru64-cxx/qplatformdefs.h | 430 | qt4/mkspecs/tru64-cxx/qplatformdefs.h | |
394 | qt4/mkspecs/tru64-g++/qmake.conf | 431 | qt4/mkspecs/tru64-g++/qmake.conf | |
395 | qt4/mkspecs/tru64-g++/qplatformdefs.h | 432 | qt4/mkspecs/tru64-g++/qplatformdefs.h | |
396 | qt4/mkspecs/unixware-cc/qmake.conf | 433 | qt4/mkspecs/unixware-cc/qmake.conf | |
397 | qt4/mkspecs/unixware-cc/qplatformdefs.h | 434 | qt4/mkspecs/unixware-cc/qplatformdefs.h | |
398 | qt4/mkspecs/unixware-g++/qmake.conf | 435 | qt4/mkspecs/unixware-g++/qmake.conf | |
399 | qt4/mkspecs/unixware-g++/qplatformdefs.h | 436 | qt4/mkspecs/unixware-g++/qplatformdefs.h | |
437 | qt4/mkspecs/unsupported/linux-host-g++/qmake.conf | |||
438 | qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h | |||
439 | qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf | |||
440 | qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h | |||
441 | qt4/mkspecs/unsupported/qmake.conf | |||
442 | qt4/mkspecs/unsupported/qnx-g++/qmake.conf | |||
443 | qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h | |||
444 | qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf | |||
445 | qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h | |||
446 | qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf | |||
447 | qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h | |||
448 | qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf | |||
449 | qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h | |||
450 | qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf | |||
451 | qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h | |||
452 | qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf | |||
453 | qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h | |||
454 | qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | |||
455 | qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h | |||
456 | qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf | |||
457 | qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h | |||
400 | qt4/mkspecs/win32-borland/qmake.conf | 458 | qt4/mkspecs/win32-borland/qmake.conf | |
401 | qt4/mkspecs/win32-borland/qplatformdefs.h | 459 | qt4/mkspecs/win32-borland/qplatformdefs.h | |
402 | qt4/mkspecs/win32-g++/qmake.conf | 460 | qt4/mkspecs/win32-g++/qmake.conf | |
403 | qt4/mkspecs/win32-g++/qplatformdefs.h | 461 | qt4/mkspecs/win32-g++/qplatformdefs.h | |
404 | qt4/mkspecs/win32-icc/qmake.conf | 462 | qt4/mkspecs/win32-icc/qmake.conf | |
405 | qt4/mkspecs/win32-icc/qplatformdefs.h | 463 | qt4/mkspecs/win32-icc/qplatformdefs.h | |
406 | qt4/mkspecs/win32-msvc.net/qmake.conf | 464 | qt4/mkspecs/win32-msvc.net/qmake.conf | |
407 | qt4/mkspecs/win32-msvc.net/qplatformdefs.h | 465 | qt4/mkspecs/win32-msvc.net/qplatformdefs.h | |
408 | qt4/mkspecs/win32-msvc/features/incremental.prf | 466 | qt4/mkspecs/win32-msvc/features/incremental.prf | |
409 | qt4/mkspecs/win32-msvc/features/incremental_off.prf | 467 | qt4/mkspecs/win32-msvc/features/incremental_off.prf | |
410 | qt4/mkspecs/win32-msvc/qmake.conf | 468 | qt4/mkspecs/win32-msvc/qmake.conf | |
411 | qt4/mkspecs/win32-msvc/qplatformdefs.h | 469 | qt4/mkspecs/win32-msvc/qplatformdefs.h | |
412 | qt4/mkspecs/win32-msvc2002/qmake.conf | 470 | qt4/mkspecs/win32-msvc2002/qmake.conf | |
@@ -435,51 +493,59 @@ qt4/mkspecs/wince50standard-mipsiv-msvc2 | @@ -435,51 +493,59 @@ qt4/mkspecs/wince50standard-mipsiv-msvc2 | |||
435 | qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h | 493 | qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h | |
436 | qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf | 494 | qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf | |
437 | qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h | 495 | qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h | |
438 | qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf | 496 | qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf | |
439 | qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h | 497 | qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h | |
440 | qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf | 498 | qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf | |
441 | qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf | 499 | qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf | |
442 | qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h | 500 | qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h | |
443 | qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf | 501 | qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf | |
444 | qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf | 502 | qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf | |
445 | qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h | 503 | qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h | |
446 | qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf | 504 | qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf | |
447 | qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h | 505 | qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h | |
506 | qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf | |||
507 | qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h | |||
448 | qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf | 508 | qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf | |
449 | qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf | 509 | qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf | |
450 | qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h | 510 | qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h | |
451 | qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf | 511 | qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf | |
452 | qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf | 512 | qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf | |
453 | qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h | 513 | qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h | |
454 | qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf | 514 | qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf | |
455 | qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf | 515 | qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf | |
456 | qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h | 516 | qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h | |
457 | qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf | 517 | qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf | |
458 | qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf | 518 | qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf | |
459 | qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h | 519 | qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h | |
460 | qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf | 520 | qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf | |
461 | qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf | 521 | qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf | |
462 | qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h | 522 | qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h | |
463 | qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf | 523 | qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf | |
464 | qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf | 524 | qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf | |
465 | qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h | 525 | qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h | |
466 | qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf | 526 | qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf | |
467 | qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf | 527 | qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf | |
468 | qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h | 528 | qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h | |
469 | qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf | 529 | qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf | |
470 | qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf | 530 | qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf | |
471 | qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h | 531 | qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h | |
532 | qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf | |||
533 | qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf | |||
534 | qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h | |||
535 | qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf | |||
536 | qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf | |||
537 | qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h | |||
472 | qt4/phrasebooks/danish.qph | 538 | qt4/phrasebooks/danish.qph | |
473 | qt4/phrasebooks/dutch.qph | 539 | qt4/phrasebooks/dutch.qph | |
474 | qt4/phrasebooks/finnish.qph | 540 | qt4/phrasebooks/finnish.qph | |
475 | qt4/phrasebooks/french.qph | 541 | qt4/phrasebooks/french.qph | |
476 | qt4/phrasebooks/german.qph | 542 | qt4/phrasebooks/german.qph | |
477 | qt4/phrasebooks/italian.qph | 543 | qt4/phrasebooks/italian.qph | |
478 | qt4/phrasebooks/japanese.qph | 544 | qt4/phrasebooks/japanese.qph | |
479 | qt4/phrasebooks/norwegian.qph | 545 | qt4/phrasebooks/norwegian.qph | |
480 | qt4/phrasebooks/polish.qph | 546 | qt4/phrasebooks/polish.qph | |
481 | qt4/phrasebooks/russian.qph | 547 | qt4/phrasebooks/russian.qph | |
482 | qt4/phrasebooks/spanish.qph | 548 | qt4/phrasebooks/spanish.qph | |
483 | qt4/phrasebooks/swedish.qph | 549 | qt4/phrasebooks/swedish.qph | |
484 | qt4/plugins/designer/libqt3supportwidgets.la | 550 | qt4/plugins/designer/libqt3supportwidgets.la | |
485 | qt4/tools/qdoc3/qdoc3 | 551 | qt4/plugins/designer/libqwebview.la |