Sat Jun 13 11:55:52 2009 UTC ()
Update to 4.5.1. Most of work done by Matthias Drochner. Upstream changelog
is too massive, see http://doc.qtsoftware.com/4.5/qt4-5-intro.html as
starting point.


(hasso)
diff -r1.15 -r1.16 pkgsrc/x11/qt4/Makefile.common
diff -r1.27 -r1.28 pkgsrc/x11/qt4-libs/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.28 -r1.29 pkgsrc/x11/qt4-libs/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-libs/files/license-acceptance
diff -r1.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-af
diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ao
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-as
diff -r1.2 -r0 pkgsrc/x11/qt4-libs/patches/patch-at
diff -r1.2 -r0 pkgsrc/x11/qt4-libs/patches/patch-au
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-av
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-ax
diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/qt4-qdbus/PLIST
diff -r1.13 -r1.14 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.15 -r1.16 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2008/10/26 14:02:33 1.15
+++ pkgsrc/x11/qt4/Makefile.common 2009/06/13 11:55:50 1.16
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1# $NetBSD: Makefile.common,v 1.15 2008/10/26 14:02:33 adam Exp $ 1# $NetBSD: Makefile.common,v 1.16 2009/06/13 11:55:50 hasso 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
5QTVERSION= 4.4.3 5QTVERSION= 4.5.1
6 6
7MAINTAINER?= adam@NetBSD.org 7MAINTAINER?= adam@NetBSD.org
8HOMEPAGE= http://www.trolltech.com/products/qt/ 8HOMEPAGE= http://www.trolltech.com/products/qt/
cvs diff -r1.27 -r1.28 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2009/02/11 07:46:15 1.27
+++ pkgsrc/x11/qt4-libs/Makefile 2009/06/13 11:55:51 1.28
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.27 2009/02/11 07:46:15 markd Exp $ 1# $NetBSD: Makefile,v 1.28 2009/06/13 11:55:51 hasso Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-libs-${QTVERSION} 7PKGNAME= qt4-libs-${QTVERSION}
8PKGREVISION= 3 
9COMMENT= C++ X GUI toolkit 8COMMENT= C++ X GUI toolkit
10 9
11BUILD_TARGET= sub-src 10BUILD_TARGET= sub-src
12INSTALL_TARGET= install_flat_headers install_targ_headers 11INSTALL_TARGET= install_flat_headers install_targ_headers
13 12
14PTHREAD_OPTS+= require 13PTHREAD_OPTS+= require
15UNLIMIT_RESOURCES= datasize 14UNLIMIT_RESOURCES= datasize
16BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 15BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
17 16
18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 17PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
19 18
20# built as plugins 19# built as plugins
21CONFIGURE_ARGS+= -no-sql-sqlite 20CONFIGURE_ARGS+= -no-sql-sqlite
cvs diff -r1.12 -r1.13 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2008/12/16 13:46:59 1.12
+++ pkgsrc/x11/qt4-libs/Makefile.common 2009/06/13 11:55:51 1.13
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile.common,v 1.12 2008/12/16 13:46:59 jmcneill Exp $ 1# $NetBSD: Makefile.common,v 1.13 2009/06/13 11:55:51 hasso Exp $
2# used by x11/qt4-libs/Makefile 2# used by x11/qt4-libs/Makefile
3 3
4DISTNAME= qt-x11-opensource-src-${QTVERSION} 4DISTNAME= qt-x11-opensource-src-${QTVERSION}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ 6MASTER_SITES= ftp://ftp.qtsoftware.com/qt/source/
7 ftp://ftp.bero.org/pub/qt/source/ 
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10.include "../../x11/qt4/Makefile.common" 9.include "../../x11/qt4/Makefile.common"
11 10
12DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 11DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
13FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 12FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
14PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 13PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
15 14
16HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_TOOLS+= gmake 18USE_TOOLS+= gmake
20 19
cvs diff -r1.28 -r1.29 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2009/02/28 11:38:01 1.28
+++ pkgsrc/x11/qt4-libs/distinfo 2009/06/13 11:55:51 1.29
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.28 2009/02/28 11:38:01 schwarz Exp $ 1$NetBSD: distinfo,v 1.29 2009/06/13 11:55:51 hasso Exp $
2 2
3SHA1 (qt-x11-opensource-src-4.4.3.tar.bz2) = 099bcc2dfda73f093f7e80e9004114d41db40b51 3SHA1 (qt-x11-opensource-src-4.5.1.tar.bz2) = 50ba9b6d2eb7056e47dc53775be509c4ff6ec015
4RMD160 (qt-x11-opensource-src-4.4.3.tar.bz2) = 3c73d9c549523efa0e760965c38c7876b4636861 4RMD160 (qt-x11-opensource-src-4.5.1.tar.bz2) = 702d7c6bb9787cd5602dcb8afce52bdfcfd52179
5Size (qt-x11-opensource-src-4.4.3.tar.bz2) = 103961247 bytes 5Size (qt-x11-opensource-src-4.5.1.tar.bz2) = 114667436 bytes
6SHA1 (patch-aa) = 7f2bd5a4052e931b1562d02eaa6a9c2966567e37 6SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c
7SHA1 (patch-ab) = 0575619a679ec81a17ede2a39cdaccb938b16fcd 7SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43
8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b 8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5 9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9 10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
11SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4 11SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d
12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e 12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203 15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a 16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c 17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
19SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1 19SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
20SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db 20SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9
21SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 21SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
22SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2 22SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34
23SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65 23SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
24SHA1 (patch-as) = 244a3017e2780270b61ac50af000cd6fd1bb9cf5 24SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
25SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11 25SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
26SHA1 (patch-au) = 811c582bb0ad252b8b5ae91685109a7410dd662d 26SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-libs/files/Attic/license-acceptance (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/files/Attic/license-acceptance 2006/02/20 12:08:15 1.1.1.1
+++ pkgsrc/x11/qt4-libs/files/Attic/license-acceptance 2009/06/13 11:55:51 1.2
cvs diff -r1.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aa 2008/10/26 14:02:33 1.8
+++ pkgsrc/x11/qt4-libs/patches/patch-aa 2009/06/13 11:55:51 1.9
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-aa,v 1.8 2008/10/26 14:02:33 adam Exp $ 1$NetBSD: patch-aa,v 1.9 2009/06/13 11:55:51 hasso Exp $
2 2
3--- qmake/generators/unix/unixmake2.cpp.orig 2008-09-27 10:58:43.000000000 +0200 3--- qmake/generators/unix/unixmake2.cpp.orig 2009-02-25 22:09:16.000000000 +0100
4+++ qmake/generators/unix/unixmake2.cpp 4+++ qmake/generators/unix/unixmake2.cpp
5@@ -228,6 +228,8 @@ UnixMakefileGenerator::writeMakeParts(QT 5@@ -232,6 +232,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@@ -978,8 +980,12 @@ void UnixMakefileGenerator::init2() 14@@ -992,8 +994,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@@ -1430,7 +1436,7 @@ UnixMakefileGenerator::writePkgConfigFil 28@@ -1444,7 +1450,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 << " "; 36 t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ab 2008/10/26 14:02:33 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-ab 2009/06/13 11:55:51 1.8
@@ -1,87 +1,107 @@ @@ -1,87 +1,107 @@
1$NetBSD: patch-ab,v 1.7 2008/10/26 14:02:33 adam Exp $ 1$NetBSD: patch-ab,v 1.8 2009/06/13 11:55:51 hasso Exp $
2 2
3--- src/gui/painting/painting.pri.orig 2008-09-27 10:58:47.000000000 +0200 3--- src/gui/painting/painting.pri.orig 2009-02-25 22:09:22.000000000 +0100
4+++ src/gui/painting/painting.pri 4+++ src/gui/painting/painting.pri
5@@ -192,11 +192,11 @@ mac { 5@@ -230,7 +230,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 mmx_compiler.commands += -mmmx 11
 12 mac {
 13 mmx_compiler.commands += -Xarch_i386 -mmmx
 14@@ -241,7 +241,7 @@ contains(QMAKE_MAC_XARCH, no) {
 15
12 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}
13 mmx_compiler.dependency_type = TYPE_C 17 mmx_compiler.dependency_type = TYPE_C
14- 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)}
15+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 19+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
16 mmx_compiler.input = MMX_SOURCES 20 mmx_compiler.input = MMX_SOURCES
17 mmx_compiler.variable_out = OBJECTS 21 mmx_compiler.variable_out = OBJECTS
18 mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} 22 mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
19@@ -204,22 +204,22 @@ mac { 23@@ -249,7 +249,7 @@ contains(QMAKE_MAC_XARCH, no) {
20 QMAKE_EXTRA_COMPILERS += mmx_compiler 24 QMAKE_EXTRA_COMPILERS += mmx_compiler
21 } 25 }
22 3dnow { 26 3dnow {
23- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline 27- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
24+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 28+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
25 mmx3dnow_compiler.commands += -m3dnow -mmmx 29
 30 mac {
 31 mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
 32@@ -260,14 +260,14 @@ contains(QMAKE_MAC_XARCH, no) {
 33
26 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}
27 mmx3dnow_compiler.dependency_type = TYPE_C 35 mmx3dnow_compiler.dependency_type = TYPE_C
28- 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)}
29+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 37+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
30 mmx3dnow_compiler.input = MMX3DNOW_SOURCES 38 mmx3dnow_compiler.input = MMX3DNOW_SOURCES
31 mmx3dnow_compiler.variable_out = OBJECTS 39 mmx3dnow_compiler.variable_out = OBJECTS
32 mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN} 40 mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
33 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
34 QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler 42 QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
35 sse { 43 sse {
36- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline 44- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
37+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 45+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
38 sse3dnow_compiler.commands += -m3dnow -msse 46
 47 mac {
 48 sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
 49@@ -278,7 +278,7 @@ contains(QMAKE_MAC_XARCH, no) {
 50
39 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}
40 sse3dnow_compiler.dependency_type = TYPE_C 52 sse3dnow_compiler.dependency_type = TYPE_C
41- 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)}
42+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 54+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
43 sse3dnow_compiler.input = SSE3DNOW_SOURCES 55 sse3dnow_compiler.input = SSE3DNOW_SOURCES
44 sse3dnow_compiler.variable_out = OBJECTS 56 sse3dnow_compiler.variable_out = OBJECTS
45 sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} 57 sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
46@@ -228,11 +228,11 @@ mac { 58@@ -287,7 +287,7 @@ contains(QMAKE_MAC_XARCH, no) {
47 } 59 }
48 } 60 }
49 sse { 61 sse {
50- sse_compiler.commands = $$QMAKE_CXX -c -Winline 62- sse_compiler.commands = $$QMAKE_CXX -c -Winline
51+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 63+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
52 sse_compiler.commands += -msse 64
 65 mac {
 66 sse_compiler.commands += -Xarch_i386 -msse
 67@@ -298,7 +298,7 @@ contains(QMAKE_MAC_XARCH, no) {
 68
53 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}
54 sse_compiler.dependency_type = TYPE_C 70 sse_compiler.dependency_type = TYPE_C
55- 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)}
56+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 72+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
57 sse_compiler.input = SSE_SOURCES 73 sse_compiler.input = SSE_SOURCES
58 sse_compiler.variable_out = OBJECTS 74 sse_compiler.variable_out = OBJECTS
59 sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} 75 sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
60@@ -240,11 +240,11 @@ mac { 76@@ -306,7 +306,7 @@ contains(QMAKE_MAC_XARCH, no) {
61 QMAKE_EXTRA_COMPILERS += sse_compiler 77 QMAKE_EXTRA_COMPILERS += sse_compiler
62 } 78 }
63 sse2 { 79 sse2 {
64- sse2_compiler.commands = $$QMAKE_CXX -c -Winline 80- sse2_compiler.commands = $$QMAKE_CXX -c -Winline
65+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 81+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
66 sse2_compiler.commands += -msse2 82
 83 mac {
 84 sse2_compiler.commands += -Xarch_i386 -msse2
 85@@ -317,7 +317,7 @@ contains(QMAKE_MAC_XARCH, no) {
 86
67 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}
68 sse2_compiler.dependency_type = TYPE_C 88 sse2_compiler.dependency_type = TYPE_C
69- 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)}
70+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 90+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
71 sse2_compiler.input = SSE2_SOURCES 91 sse2_compiler.input = SSE2_SOURCES
72 sse2_compiler.variable_out = OBJECTS 92 sse2_compiler.variable_out = OBJECTS
73 sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} 93 sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
74@@ -252,11 +252,11 @@ mac { 94@@ -325,11 +325,11 @@ contains(QMAKE_MAC_XARCH, no) {
75 QMAKE_EXTRA_COMPILERS += sse2_compiler 95 QMAKE_EXTRA_COMPILERS += sse2_compiler
76 } 96 }
77 iwmmxt { 97 iwmmxt {
78- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline 98- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
79+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 99+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
80 iwmmxt_compiler.commands += -mcpu=iwmmxt 100 iwmmxt_compiler.commands += -mcpu=iwmmxt
81 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}
82 iwmmxt_compiler.dependency_type = TYPE_C 102 iwmmxt_compiler.dependency_type = TYPE_C
83- 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)}
84+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 104+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
85 iwmmxt_compiler.input = IWMMXT_SOURCES 105 iwmmxt_compiler.input = IWMMXT_SOURCES
86 iwmmxt_compiler.variable_out = OBJECTS 106 iwmmxt_compiler.variable_out = OBJECTS
87 iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN} 107 iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-af 2008/07/24 12:55:20 1.5
+++ pkgsrc/x11/qt4-libs/patches/patch-af 2009/06/13 11:55:51 1.6
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-af,v 1.5 2008/07/24 12:55:20 markd Exp $ 1$NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $
2 2
3--- qmake/Makefile.unix.orig 2008-04-28 15:11:14.000000000 +0200 3--- qmake/Makefile.unix.orig 2009-02-25 22:09:16.000000000 +0100
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@@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta
15 $(SOURCE_PATH)/src/script/qscriptstring.cpp \ 15 $(SOURCE_PATH)/src/script/qscriptstring.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 \
19+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ 19+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
20 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ 20 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
21 -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \ 21 -I$(BUILD_PATH)/src/corelib/global \
22 -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \ 22 -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
23@@ -96,7 +96,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators 23@@ -97,7 +97,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
cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ao 2008/10/26 14:02:33 1.5
+++ pkgsrc/x11/qt4-libs/patches/patch-ao 2009/06/13 11:55:51 1.6
@@ -1,75 +1,63 @@ @@ -1,75 +1,63 @@
1$NetBSD: patch-ao,v 1.5 2008/10/26 14:02:33 adam Exp $ 1$NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $
2 2
3--- src/corelib/codecs/qiconvcodec.cpp.orig 2008-09-27 10:58:46.000000000 +0200 3--- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100
4+++ src/corelib/codecs/qiconvcodec.cpp 4+++ src/corelib/codecs/qiconvcodec.cpp
5@@ -44,9 +44,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_QNX6) && !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_QNX6) && !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@@ -63,6 +68,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@@ -146,7 +154,7 @@ QString QIconvCodec::convertToUnicode(co 31@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co
32 QByteArray ba; 32 IconvState *state = *pstate;
33 size_t outBytesLeft = len * 2 + 2; 33 size_t inBytesLeft = len;
34 ba.resize(outBytesLeft); 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@@ -206,7 +214,7 @@ QByteArray QIconvCodec::convertFromUnico 40@@ -306,7 +314,7 @@ QByteArray QIconvCodec::convertFromUnico
41 ba.resize(outBytesLeft); 41 char *outBytes;
42 char *outBytes = ba.data(); 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 *inBytes; 46 const char **inBytesPtr = const_cast<const char **>(&inBytes);
47 #else 47 #else
48 char *inBytes; 48 char **inBytesPtr = &inBytes;
49@@ -216,7 +224,7 @@ QByteArray QIconvCodec::convertFromUnico 49@@ -454,11 +462,13 @@ iconv_t QIconvCodec::createIconv_t(const
50 #if !defined(NO_BOM) 50 static const char empty_codeset[] = "";
51 // give iconv() a BOM 51 const char *codeset = empty_codeset;
52 QChar bom[] = { QChar(QChar::ByteOrderMark) }; 52 cd = iconv_open(to ? to : codeset, from ? from : codeset);
53-#ifdef GNU_LIBICONV 53+#elif defined(__NetBSD)
54+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 54+ const char *codeset = 0;
55 // GNU doesn't disagree with POSIX :/ 
56 inBytes = reinterpret_cast<const char *>(bom); 
57 #else 
58@@ -230,7 +238,7 @@ QByteArray QIconvCodec::convertFromUnico 
59 #endif // NO_BOM 
60  
61 // now feed iconv() the real data 
62-#ifdef GNU_LIBICONV 
63+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 
64 // GNU doesn't disagree with POSIX :/ 
65 inBytes = reinterpret_cast<const char *>(uc); 
66 #else 55 #else
67@@ -296,7 +304,7 @@ iconv_t QIconvCodec::createIconv_t(const 
68 char *codeset = 0; 56 char *codeset = 0;
69 #endif 57 #endif
70  58
71-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) 59-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
72+#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_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
73 if (cd == (iconv_t) -1) { 61 if (cd == (iconv_t) -1) {
74 codeset = nl_langinfo(CODESET); 62 codeset = nl_langinfo(CODESET);
75 if (codeset) 63 if (codeset)
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2008/10/26 14:02:33 1.3
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2009/06/13 11:55:51 1.4
@@ -1,13 +1,63 @@ @@ -1,13 +1,63 @@
1$NetBSD: patch-aq,v 1.3 2008/10/26 14:02:33 adam Exp $ 1$NetBSD: patch-aq,v 1.4 2009/06/13 11:55:51 hasso Exp $
2 2
3--- configure.orig 2008-09-27 10:58:41.000000000 +0200 3--- configure.orig 2009-04-22 01:57:35.000000000 +0200
4+++ configure 4+++ configure
5@@ -5856,7 +5856,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 5@@ -2745,7 +2745,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [
6 [ "$CFG_TABLET" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET" 6 fi
 7
 8 #auto-detect DWARF2 on the mac
 9-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then
 10+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
 11 if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
 12 CFG_MAC_DWARF2=no
 13 else
 14@@ -2754,7 +2754,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF
 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@@ -5504,18 +5504,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@@ -6445,7 +6445,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 47 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
7 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 48 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
8 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 49 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
9-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 50-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
10+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 51+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
11  52
12 # X11/Unix/Mac only configs 53 if [ "$PLATFORM_QWS" != "yes" ]; then
13 [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" 54 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
 55@@ -6762,7 +6762,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.
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-as (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-as 2008/10/26 14:02:33 1.2
+++ pkgsrc/x11/qt4-libs/patches/patch-as 2009/06/13 11:55:51 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-as,v 1.2 2008/10/26 14:02:33 adam Exp $ 1$NetBSD: patch-as,v 1.3 2009/06/13 11:55:51 hasso Exp $
2 2
3--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2008-09-27 10:58:48.000000000 +0200 3--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2009-02-25 22:09:25.000000000 +0100
4+++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h 4+++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h
5@@ -87,7 +87,7 @@ configure. 5@@ -87,7 +87,7 @@ configure.
6 #define _CL_HAVE_FCNTL_H 1  6 #define _CL_HAVE_FCNTL_H 1
7 #endif 7 #endif
8  8
9-#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \ 9-#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \
10+#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD__) && \ 10+#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD) && \
11 !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \ 11 !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \
12 defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64)) 12 defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64))
13 /* Define to 1 if the system has the type `float_t'. */ 13 /* Define to 1 if the system has the type `float_t'. */
14@@ -425,7 +425,7 @@ configure. 14@@ -425,7 +425,7 @@ configure.
15 # endif 15 # endif
16 #endif 16 #endif
17  17
18-#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) 18-#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC)
19+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__) 19+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__)
20 /* Define to 1 if you have a functioning <wchar.h> header file. */ 20 /* Define to 1 if you have a functioning <wchar.h> header file. */
21 # ifndef _CL_HAVE_WCTYPE_H  21 # ifndef _CL_HAVE_WCTYPE_H
22 # define _CL_HAVE_WCTYPE_H 22 # define _CL_HAVE_WCTYPE_H
File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-at
File Deleted: pkgsrc/x11/qt4-libs/patches/patch-au
File Added: pkgsrc/x11/qt4-libs/patches/patch-av
$NetBSD: patch-av,v 1.1 2009/06/13 11:55:51 hasso Exp $

--- config.tests/mac/dwarf2.test.orig	2009-03-11 15:13:41.000000000 +0100
+++ config.tests/mac/dwarf2.test
@@ -21,7 +21,7 @@ rm -f dwarf2.c dwarf2.o
 "$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon;
 ./xcodeversion
 
-if [ "$?" == "1" ]; then
+if [ "$?" = "1" ]; then
     DWARF2_SUPPORT_BROKEN=yes
 fi
 
@@ -32,7 +32,7 @@ if [ "$DWARF2_SUPPORT" != "yes" ]; then
     [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
     exit 0
 else
-    if [ "$DWARF2_SUPPORT_BROKEN" == "yes" ]; then
+    if [ "$DWARF2_SUPPORT_BROKEN" = "yes" ]; then
         [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
         exit 0
     else
File Added: pkgsrc/x11/qt4-libs/patches/Attic/patch-ax
$NetBSD: patch-ax,v 1.1 2009/06/13 11:55:51 hasso Exp $

--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig	2009-04-22 02:57:38 +0300
+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2009-05-01 19:45:48 +0300
@@ -76,9 +76,7 @@ extern int *__libc_stack_end;
 #include <thread.h>
 #endif
 
-#if PLATFORM(OPENBSD)
 #include <pthread.h>
-#endif
 
 #if HAVE(PTHREAD_NP_H)
 #include <pthread_np.h>
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2009/04/15 20:39:42 1.1.1.1
+++ pkgsrc/x11/qt4-mysql/Makefile 2009/06/13 11:55:51 1.2
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/04/15 20:39:42 markd Exp $ 1# $NetBSD: Makefile,v 1.2 2009/06/13 11:55:51 hasso Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-mysql-${QTVERSION} 5PKGNAME= qt4-mysql-${QTVERSION}
6COMMENT= QT mysql driver 6COMMENT= QT mysql driver
7 7
8CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
9CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
10 10
11BUILD_QT4= yes 11BUILD_QT4= yes
12 12
13do-build: 13do-build:
 14 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
14 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
15 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
16 17
17SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 18SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
18 19
19do-install: 20do-install:
20 ${INSTALL_DATA_DIR} ${SQLDRVDIR} 21 ${INSTALL_DATA_DIR} ${SQLDRVDIR}
21 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \ 22 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
22 ${SQLDRVDIR} 23 ${SQLDRVDIR}
23 24
24.include "../../x11/qt4-libs/buildlink3.mk" 25.include "../../x11/qt4-libs/buildlink3.mk"
25.include "../../x11/qt4-tools/buildlink3.mk" 26.include "../../x11/qt4-tools/buildlink3.mk"
26.include "../../mk/mysql.buildlink3.mk" 27.include "../../mk/mysql.buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt4-qdbus/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/PLIST 2008/07/24 12:55:20 1.2
+++ pkgsrc/x11/qt4-qdbus/PLIST 2009/06/13 11:55:51 1.3
@@ -1,53 +1,61 @@ @@ -1,53 +1,61 @@
1@comment $NetBSD: PLIST,v 1.2 2008/07/24 12:55:20 markd Exp $ 1@comment $NetBSD: PLIST,v 1.3 2009/06/13 11:55:51 hasso Exp $
2lib/pkgconfig/QtDBus.pc 2lib/pkgconfig/QtDBus.pc
3qt4/bin/qdbus 3qt4/bin/qdbus
4qt4/bin/qdbuscpp2xml 4qt4/bin/qdbuscpp2xml
5qt4/bin/qdbusviewer 5qt4/bin/qdbusviewer
6qt4/bin/qdbusxml2cpp 6qt4/bin/qdbusxml2cpp
7qt4/include/Qt/QtDBus 7qt4/include/Qt/QtDBus
8qt4/include/Qt/qdbusabstractadaptor.h 8qt4/include/Qt/qdbusabstractadaptor.h
9qt4/include/Qt/qdbusabstractinterface.h 9qt4/include/Qt/qdbusabstractinterface.h
10qt4/include/Qt/qdbusargument.h 10qt4/include/Qt/qdbusargument.h
11qt4/include/Qt/qdbusconnection.h 11qt4/include/Qt/qdbusconnection.h
12qt4/include/Qt/qdbusconnectioninterface.h 12qt4/include/Qt/qdbusconnectioninterface.h
13qt4/include/Qt/qdbuscontext.h 13qt4/include/Qt/qdbuscontext.h
14qt4/include/Qt/qdbuserror.h 14qt4/include/Qt/qdbuserror.h
15qt4/include/Qt/qdbusextratypes.h 15qt4/include/Qt/qdbusextratypes.h
16qt4/include/Qt/qdbusinterface.h 16qt4/include/Qt/qdbusinterface.h
17qt4/include/Qt/qdbusmacros.h 17qt4/include/Qt/qdbusmacros.h
18qt4/include/Qt/qdbusmessage.h 18qt4/include/Qt/qdbusmessage.h
19qt4/include/Qt/qdbusmetatype.h 19qt4/include/Qt/qdbusmetatype.h
 20qt4/include/Qt/qdbuspendingcall.h
 21qt4/include/Qt/qdbuspendingreply.h
20qt4/include/Qt/qdbusreply.h 22qt4/include/Qt/qdbusreply.h
21qt4/include/Qt/qdbusserver.h 23qt4/include/Qt/qdbusserver.h
22qt4/include/QtDBus/QDBusAbstractAdaptor 24qt4/include/QtDBus/QDBusAbstractAdaptor
23qt4/include/QtDBus/QDBusAbstractInterface 25qt4/include/QtDBus/QDBusAbstractInterface
24qt4/include/QtDBus/QDBusArgument 26qt4/include/QtDBus/QDBusArgument
25qt4/include/QtDBus/QDBusConnection 27qt4/include/QtDBus/QDBusConnection
26qt4/include/QtDBus/QDBusConnectionInterface 28qt4/include/QtDBus/QDBusConnectionInterface
27qt4/include/QtDBus/QDBusContext 29qt4/include/QtDBus/QDBusContext
28qt4/include/QtDBus/QDBusError 30qt4/include/QtDBus/QDBusError
29qt4/include/QtDBus/QDBusInterface 31qt4/include/QtDBus/QDBusInterface
30qt4/include/QtDBus/QDBusMessage 32qt4/include/QtDBus/QDBusMessage
31qt4/include/QtDBus/QDBusMetaType 33qt4/include/QtDBus/QDBusMetaType
32qt4/include/QtDBus/QDBusObjectPath 34qt4/include/QtDBus/QDBusObjectPath
 35qt4/include/QtDBus/QDBusPendingCall
 36qt4/include/QtDBus/QDBusPendingCallWatcher
 37qt4/include/QtDBus/QDBusPendingReply
 38qt4/include/QtDBus/QDBusPendingReplyData
33qt4/include/QtDBus/QDBusReply 39qt4/include/QtDBus/QDBusReply
34qt4/include/QtDBus/QDBusServer 40qt4/include/QtDBus/QDBusServer
35qt4/include/QtDBus/QDBusSignature 41qt4/include/QtDBus/QDBusSignature
36qt4/include/QtDBus/QDBusVariant 42qt4/include/QtDBus/QDBusVariant
37qt4/include/QtDBus/QtDBus 43qt4/include/QtDBus/QtDBus
38qt4/include/QtDBus/qdbusabstractadaptor.h 44qt4/include/QtDBus/qdbusabstractadaptor.h
39qt4/include/QtDBus/qdbusabstractinterface.h 45qt4/include/QtDBus/qdbusabstractinterface.h
40qt4/include/QtDBus/qdbusargument.h 46qt4/include/QtDBus/qdbusargument.h
41qt4/include/QtDBus/qdbusconnection.h 47qt4/include/QtDBus/qdbusconnection.h
42qt4/include/QtDBus/qdbusconnectioninterface.h 48qt4/include/QtDBus/qdbusconnectioninterface.h
43qt4/include/QtDBus/qdbuscontext.h 49qt4/include/QtDBus/qdbuscontext.h
44qt4/include/QtDBus/qdbuserror.h 50qt4/include/QtDBus/qdbuserror.h
45qt4/include/QtDBus/qdbusextratypes.h 51qt4/include/QtDBus/qdbusextratypes.h
46qt4/include/QtDBus/qdbusinterface.h 52qt4/include/QtDBus/qdbusinterface.h
47qt4/include/QtDBus/qdbusmacros.h 53qt4/include/QtDBus/qdbusmacros.h
48qt4/include/QtDBus/qdbusmessage.h 54qt4/include/QtDBus/qdbusmessage.h
49qt4/include/QtDBus/qdbusmetatype.h 55qt4/include/QtDBus/qdbusmetatype.h
 56qt4/include/QtDBus/qdbuspendingcall.h
 57qt4/include/QtDBus/qdbuspendingreply.h
50qt4/include/QtDBus/qdbusreply.h 58qt4/include/QtDBus/qdbusreply.h
51qt4/include/QtDBus/qdbusserver.h 59qt4/include/QtDBus/qdbusserver.h
52qt4/lib/libQtDBus.la 60qt4/lib/libQtDBus.la
53@dirrm qt4/include/QtDBus 61@dirrm qt4/include/QtDBus
cvs diff -r1.13 -r1.14 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2008/10/26 14:02:33 1.13
+++ pkgsrc/x11/qt4-tools/PLIST 2009/06/13 11:55:52 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2008/10/26 14:02:33 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2009/06/13 11:55:52 hasso Exp $
2lib/pkgconfig/QtAssistantClient.pc 2lib/pkgconfig/QtAssistantClient.pc
3lib/pkgconfig/QtCLucene.pc 3lib/pkgconfig/QtCLucene.pc
4lib/pkgconfig/QtDesigner.pc 4lib/pkgconfig/QtDesigner.pc
5lib/pkgconfig/QtDesignerComponents.pc 5lib/pkgconfig/QtDesignerComponents.pc
6lib/pkgconfig/QtHelp.pc 6lib/pkgconfig/QtHelp.pc
7lib/pkgconfig/QtUiTools.pc 7lib/pkgconfig/QtUiTools.pc
8qt4/bin/assistant 8qt4/bin/assistant
9qt4/bin/assistant_adp 9qt4/bin/assistant_adp
10qt4/bin/designer 10qt4/bin/designer
11qt4/bin/linguist 11qt4/bin/linguist
12qt4/bin/lrelease 12qt4/bin/lrelease
13qt4/bin/lupdate 13qt4/bin/lupdate
14qt4/bin/pixeltool 14qt4/bin/pixeltool
@@ -142,58 +142,62 @@ qt4/mkspecs/aix-g++-64/qplatformdefs.h @@ -142,58 +142,62 @@ qt4/mkspecs/aix-g++-64/qplatformdefs.h
142qt4/mkspecs/aix-g++/qmake.conf 142qt4/mkspecs/aix-g++/qmake.conf
143qt4/mkspecs/aix-g++/qplatformdefs.h 143qt4/mkspecs/aix-g++/qplatformdefs.h
144qt4/mkspecs/aix-xlc-64/qmake.conf 144qt4/mkspecs/aix-xlc-64/qmake.conf
145qt4/mkspecs/aix-xlc-64/qplatformdefs.h 145qt4/mkspecs/aix-xlc-64/qplatformdefs.h
146qt4/mkspecs/aix-xlc/qmake.conf 146qt4/mkspecs/aix-xlc/qmake.conf
147qt4/mkspecs/aix-xlc/qplatformdefs.h 147qt4/mkspecs/aix-xlc/qplatformdefs.h
148qt4/mkspecs/common/g++.conf 148qt4/mkspecs/common/g++.conf
149qt4/mkspecs/common/linux.conf 149qt4/mkspecs/common/linux.conf
150qt4/mkspecs/common/llvm.conf 150qt4/mkspecs/common/llvm.conf
151qt4/mkspecs/common/mac-g++.conf 151qt4/mkspecs/common/mac-g++.conf
152qt4/mkspecs/common/mac-llvm.conf 152qt4/mkspecs/common/mac-llvm.conf
153qt4/mkspecs/common/mac.conf 153qt4/mkspecs/common/mac.conf
154qt4/mkspecs/common/qmake.conf 154qt4/mkspecs/common/qmake.conf
 155qt4/mkspecs/common/qws.conf
155qt4/mkspecs/common/unix.conf 156qt4/mkspecs/common/unix.conf
 157qt4/mkspecs/common/wince.conf
156qt4/mkspecs/cygwin-g++/qmake.conf 158qt4/mkspecs/cygwin-g++/qmake.conf
157qt4/mkspecs/cygwin-g++/qplatformdefs.h 159qt4/mkspecs/cygwin-g++/qplatformdefs.h
158qt4/mkspecs/darwin-g++/qmake.conf 160qt4/mkspecs/darwin-g++/qmake.conf
159qt4/mkspecs/darwin-g++/qplatformdefs.h 161qt4/mkspecs/darwin-g++/qplatformdefs.h
160qt4/mkspecs/default 162qt4/mkspecs/default
161qt4/mkspecs/features/assistant.prf 163qt4/mkspecs/features/assistant.prf
162qt4/mkspecs/features/build_pass.prf 164qt4/mkspecs/features/build_pass.prf
163qt4/mkspecs/features/dbusadaptors.prf 165qt4/mkspecs/features/dbusadaptors.prf
164qt4/mkspecs/features/dbusinterfaces.prf 166qt4/mkspecs/features/dbusinterfaces.prf
165qt4/mkspecs/features/debug.prf 167qt4/mkspecs/features/debug.prf
166qt4/mkspecs/features/debug_and_release.prf 168qt4/mkspecs/features/debug_and_release.prf
167qt4/mkspecs/features/default_post.prf 169qt4/mkspecs/features/default_post.prf
168qt4/mkspecs/features/default_pre.prf 170qt4/mkspecs/features/default_pre.prf
169qt4/mkspecs/features/designer.prf 171qt4/mkspecs/features/designer.prf
170qt4/mkspecs/features/dll.prf 172qt4/mkspecs/features/dll.prf
171qt4/mkspecs/features/exclusive_builds.prf 173qt4/mkspecs/features/exclusive_builds.prf
172qt4/mkspecs/features/help.prf 174qt4/mkspecs/features/help.prf
 175qt4/mkspecs/features/include_source_dir.prf
173qt4/mkspecs/features/incredibuild_xge.prf 176qt4/mkspecs/features/incredibuild_xge.prf
174qt4/mkspecs/features/lex.prf 177qt4/mkspecs/features/lex.prf
175qt4/mkspecs/features/link_pkgconfig.prf 178qt4/mkspecs/features/link_pkgconfig.prf
176qt4/mkspecs/features/mac/default_post.prf 179qt4/mkspecs/features/mac/default_post.prf
177qt4/mkspecs/features/mac/default_pre.prf 180qt4/mkspecs/features/mac/default_pre.prf
178qt4/mkspecs/features/mac/dwarf2.prf 181qt4/mkspecs/features/mac/dwarf2.prf
179qt4/mkspecs/features/mac/objective_c.prf 182qt4/mkspecs/features/mac/objective_c.prf
180qt4/mkspecs/features/mac/ppc.prf 183qt4/mkspecs/features/mac/ppc.prf
181qt4/mkspecs/features/mac/ppc64.prf 184qt4/mkspecs/features/mac/ppc64.prf
182qt4/mkspecs/features/mac/rez.prf 185qt4/mkspecs/features/mac/rez.prf
183qt4/mkspecs/features/mac/sdk.prf 186qt4/mkspecs/features/mac/sdk.prf
184qt4/mkspecs/features/mac/x86.prf 187qt4/mkspecs/features/mac/x86.prf
185qt4/mkspecs/features/mac/x86_64.prf 188qt4/mkspecs/features/mac/x86_64.prf
186qt4/mkspecs/features/moc.prf 189qt4/mkspecs/features/moc.prf
 190qt4/mkspecs/features/no_debug_info.prf
187qt4/mkspecs/features/qdbus.prf 191qt4/mkspecs/features/qdbus.prf
188qt4/mkspecs/features/qmake.conf 192qt4/mkspecs/features/qmake.conf
189qt4/mkspecs/features/qt.prf 193qt4/mkspecs/features/qt.prf
190qt4/mkspecs/features/qt_config.prf 194qt4/mkspecs/features/qt_config.prf
191qt4/mkspecs/features/qt_functions.prf 195qt4/mkspecs/features/qt_functions.prf
192qt4/mkspecs/features/qtestlib.prf 196qt4/mkspecs/features/qtestlib.prf
193qt4/mkspecs/features/qtopia.prf 197qt4/mkspecs/features/qtopia.prf
194qt4/mkspecs/features/qtopiainc.prf 198qt4/mkspecs/features/qtopiainc.prf
195qt4/mkspecs/features/qtopialib.prf 199qt4/mkspecs/features/qtopialib.prf
196qt4/mkspecs/features/release.prf 200qt4/mkspecs/features/release.prf
197qt4/mkspecs/features/resources.prf 201qt4/mkspecs/features/resources.prf
198qt4/mkspecs/features/shared.prf 202qt4/mkspecs/features/shared.prf
199qt4/mkspecs/features/silent.prf 203qt4/mkspecs/features/silent.prf
@@ -203,37 +207,38 @@ qt4/mkspecs/features/staticlib.prf @@ -203,37 +207,38 @@ qt4/mkspecs/features/staticlib.prf
203qt4/mkspecs/features/uic.prf 207qt4/mkspecs/features/uic.prf
204qt4/mkspecs/features/uitools.prf 208qt4/mkspecs/features/uitools.prf
205qt4/mkspecs/features/unix/bsymbolic_functions.prf 209qt4/mkspecs/features/unix/bsymbolic_functions.prf
206qt4/mkspecs/features/unix/dylib.prf 210qt4/mkspecs/features/unix/dylib.prf
207qt4/mkspecs/features/unix/hide_symbols.prf 211qt4/mkspecs/features/unix/hide_symbols.prf
208qt4/mkspecs/features/unix/largefile.prf 212qt4/mkspecs/features/unix/largefile.prf
209qt4/mkspecs/features/unix/opengl.prf 213qt4/mkspecs/features/unix/opengl.prf
210qt4/mkspecs/features/unix/separate_debug_info.prf 214qt4/mkspecs/features/unix/separate_debug_info.prf
211qt4/mkspecs/features/unix/thread.prf 215qt4/mkspecs/features/unix/thread.prf
212qt4/mkspecs/features/unix/x11.prf 216qt4/mkspecs/features/unix/x11.prf
213qt4/mkspecs/features/unix/x11inc.prf 217qt4/mkspecs/features/unix/x11inc.prf
214qt4/mkspecs/features/unix/x11lib.prf 218qt4/mkspecs/features/unix/x11lib.prf
215qt4/mkspecs/features/unix/x11sm.prf 219qt4/mkspecs/features/unix/x11sm.prf
 220qt4/mkspecs/features/use_c_linker.prf
216qt4/mkspecs/features/warn_off.prf 221qt4/mkspecs/features/warn_off.prf
217qt4/mkspecs/features/warn_on.prf 222qt4/mkspecs/features/warn_on.prf
218qt4/mkspecs/features/win32/console.prf 223qt4/mkspecs/features/win32/console.prf
 224qt4/mkspecs/features/win32/default_post.prf
219qt4/mkspecs/features/win32/default_pre.prf 225qt4/mkspecs/features/win32/default_pre.prf
220qt4/mkspecs/features/win32/dumpcpp.prf 226qt4/mkspecs/features/win32/dumpcpp.prf
221qt4/mkspecs/features/win32/embed_manifest_dll.prf 227qt4/mkspecs/features/win32/embed_manifest_dll.prf
222qt4/mkspecs/features/win32/embed_manifest_exe.prf 228qt4/mkspecs/features/win32/embed_manifest_exe.prf
223qt4/mkspecs/features/win32/exceptions.prf 229qt4/mkspecs/features/win32/exceptions.prf
224qt4/mkspecs/features/win32/exceptions_off.prf 230qt4/mkspecs/features/win32/exceptions_off.prf
225qt4/mkspecs/features/win32/opengl.prf 231qt4/mkspecs/features/win32/opengl.prf
226qt4/mkspecs/features/win32/profiling.prf 
227qt4/mkspecs/features/win32/qaxcontainer.prf 232qt4/mkspecs/features/win32/qaxcontainer.prf
228qt4/mkspecs/features/win32/qaxserver.prf 233qt4/mkspecs/features/win32/qaxserver.prf
229qt4/mkspecs/features/win32/qt_dll.prf 234qt4/mkspecs/features/win32/qt_dll.prf
230qt4/mkspecs/features/win32/rtti.prf 235qt4/mkspecs/features/win32/rtti.prf
231qt4/mkspecs/features/win32/rtti_off.prf 236qt4/mkspecs/features/win32/rtti_off.prf
232qt4/mkspecs/features/win32/stl.prf 237qt4/mkspecs/features/win32/stl.prf
233qt4/mkspecs/features/win32/stl_off.prf 238qt4/mkspecs/features/win32/stl_off.prf
234qt4/mkspecs/features/win32/thread.prf 239qt4/mkspecs/features/win32/thread.prf
235qt4/mkspecs/features/win32/thread_off.prf 240qt4/mkspecs/features/win32/thread_off.prf
236qt4/mkspecs/features/win32/windows.prf 241qt4/mkspecs/features/win32/windows.prf
237qt4/mkspecs/features/yacc.prf 242qt4/mkspecs/features/yacc.prf
238qt4/mkspecs/freebsd-g++/qmake.conf 243qt4/mkspecs/freebsd-g++/qmake.conf
239qt4/mkspecs/freebsd-g++/qplatformdefs.h 244qt4/mkspecs/freebsd-g++/qplatformdefs.h
@@ -291,66 +296,80 @@ qt4/mkspecs/linux-kcc/qmake.conf @@ -291,66 +296,80 @@ qt4/mkspecs/linux-kcc/qmake.conf
291qt4/mkspecs/linux-kcc/qplatformdefs.h 296qt4/mkspecs/linux-kcc/qplatformdefs.h
292qt4/mkspecs/linux-llvm/qmake.conf 297qt4/mkspecs/linux-llvm/qmake.conf
293qt4/mkspecs/linux-llvm/qplatformdefs.h 298qt4/mkspecs/linux-llvm/qplatformdefs.h
294qt4/mkspecs/linux-lsb-g++/qmake.conf 299qt4/mkspecs/linux-lsb-g++/qmake.conf
295qt4/mkspecs/linux-lsb-g++/qplatformdefs.h 300qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
296qt4/mkspecs/linux-pgcc/qmake.conf 301qt4/mkspecs/linux-pgcc/qmake.conf
297qt4/mkspecs/linux-pgcc/qplatformdefs.h 302qt4/mkspecs/linux-pgcc/qplatformdefs.h
298qt4/mkspecs/lynxos-g++/qmake.conf 303qt4/mkspecs/lynxos-g++/qmake.conf
299qt4/mkspecs/lynxos-g++/qplatformdefs.h 304qt4/mkspecs/lynxos-g++/qplatformdefs.h
300qt4/mkspecs/macx-g++/Info.plist.app 305qt4/mkspecs/macx-g++/Info.plist.app
301qt4/mkspecs/macx-g++/Info.plist.lib 306qt4/mkspecs/macx-g++/Info.plist.lib
302qt4/mkspecs/macx-g++/qmake.conf 307qt4/mkspecs/macx-g++/qmake.conf
303qt4/mkspecs/macx-g++/qplatformdefs.h 308qt4/mkspecs/macx-g++/qplatformdefs.h
 309qt4/mkspecs/macx-g++42/Info.plist.app
 310qt4/mkspecs/macx-g++42/Info.plist.lib
 311qt4/mkspecs/macx-g++42/qmake.conf
 312qt4/mkspecs/macx-g++42/qplatformdefs.h
304qt4/mkspecs/macx-icc/qmake.conf 313qt4/mkspecs/macx-icc/qmake.conf
305qt4/mkspecs/macx-icc/qplatformdefs.h 314qt4/mkspecs/macx-icc/qplatformdefs.h
306qt4/mkspecs/macx-llvm/Info.plist.app 315qt4/mkspecs/macx-llvm/Info.plist.app
307qt4/mkspecs/macx-llvm/Info.plist.lib 316qt4/mkspecs/macx-llvm/Info.plist.lib
308qt4/mkspecs/macx-llvm/qmake.conf 317qt4/mkspecs/macx-llvm/qmake.conf
309qt4/mkspecs/macx-llvm/qplatformdefs.h 318qt4/mkspecs/macx-llvm/qplatformdefs.h
310qt4/mkspecs/macx-pbuilder/Info.plist.app 319qt4/mkspecs/macx-pbuilder/Info.plist.app
311qt4/mkspecs/macx-pbuilder/qmake.conf 320qt4/mkspecs/macx-pbuilder/qmake.conf
312qt4/mkspecs/macx-pbuilder/qplatformdefs.h 321qt4/mkspecs/macx-pbuilder/qplatformdefs.h
313qt4/mkspecs/macx-xcode/Info.plist.app 322qt4/mkspecs/macx-xcode/Info.plist.app
314qt4/mkspecs/macx-xcode/Info.plist.lib 323qt4/mkspecs/macx-xcode/Info.plist.lib
315qt4/mkspecs/macx-xcode/qmake.conf 324qt4/mkspecs/macx-xcode/qmake.conf
316qt4/mkspecs/macx-xcode/qplatformdefs.h 325qt4/mkspecs/macx-xcode/qplatformdefs.h
317qt4/mkspecs/macx-xlc/qmake.conf 326qt4/mkspecs/macx-xlc/qmake.conf
318qt4/mkspecs/macx-xlc/qplatformdefs.h 327qt4/mkspecs/macx-xlc/qplatformdefs.h
319qt4/mkspecs/netbsd-g++/qmake.conf 328qt4/mkspecs/netbsd-g++/qmake.conf
320qt4/mkspecs/netbsd-g++/qplatformdefs.h 329qt4/mkspecs/netbsd-g++/qplatformdefs.h
321qt4/mkspecs/openbsd-g++/qmake.conf 330qt4/mkspecs/openbsd-g++/qmake.conf
322qt4/mkspecs/openbsd-g++/qplatformdefs.h 331qt4/mkspecs/openbsd-g++/qplatformdefs.h
323qt4/mkspecs/qconfig.pri 332qt4/mkspecs/qconfig.pri
324qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf 333qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
325qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h 334qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
326qt4/mkspecs/qws/linux-arm-g++/qmake.conf 335qt4/mkspecs/qws/linux-arm-g++/qmake.conf
327qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h 336qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
 337qt4/mkspecs/qws/linux-armv6-g++/qmake.conf
 338qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
328qt4/mkspecs/qws/linux-avr32-g++/qmake.conf 339qt4/mkspecs/qws/linux-avr32-g++/qmake.conf
329qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h 340qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
330qt4/mkspecs/qws/linux-cellon-g++/qmake.conf 341qt4/mkspecs/qws/linux-cellon-g++/qmake.conf
331qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h 342qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
332qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf 343qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf
333qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h 344qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
 345qt4/mkspecs/qws/linux-dm800-g++/qmake.conf
 346qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
334qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf 347qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
335qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h 348qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
336qt4/mkspecs/qws/linux-generic-g++/qmake.conf 349qt4/mkspecs/qws/linux-generic-g++/qmake.conf
337qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h 350qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h
338qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf 351qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
339qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h 352qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
340qt4/mkspecs/qws/linux-lsb-g++/qmake.conf 353qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
341qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h 354qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
342qt4/mkspecs/qws/linux-mips-g++/qmake.conf 355qt4/mkspecs/qws/linux-mips-g++/qmake.conf
343qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h 356qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
 357qt4/mkspecs/qws/linux-ppc-g++/qmake.conf
 358qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h
 359qt4/mkspecs/qws/linux-sh-g++/qmake.conf
 360qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h
 361qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf
 362qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
344qt4/mkspecs/qws/linux-sharp-g++/qmake.conf 363qt4/mkspecs/qws/linux-sharp-g++/qmake.conf
345qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h 364qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h
346qt4/mkspecs/qws/linux-x86-g++/qmake.conf 365qt4/mkspecs/qws/linux-x86-g++/qmake.conf
347qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h 366qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h
348qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf 367qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf
349qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h 368qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
350qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf 369qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf
351qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h 370qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
352qt4/mkspecs/qws/macx-generic-g++/qmake.conf 371qt4/mkspecs/qws/macx-generic-g++/qmake.conf
353qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h 372qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h
354qt4/mkspecs/qws/qmake.conf 373qt4/mkspecs/qws/qmake.conf
355qt4/mkspecs/qws/solaris-generic-g++/qmake.conf 374qt4/mkspecs/qws/solaris-generic-g++/qmake.conf
356qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h 375qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@@ -364,78 +383,96 @@ qt4/mkspecs/solaris-cc/qmake.conf @@ -364,78 +383,96 @@ qt4/mkspecs/solaris-cc/qmake.conf
364qt4/mkspecs/solaris-cc/qplatformdefs.h 383qt4/mkspecs/solaris-cc/qplatformdefs.h
365qt4/mkspecs/solaris-g++-64/qmake.conf 384qt4/mkspecs/solaris-g++-64/qmake.conf
366qt4/mkspecs/solaris-g++-64/qplatformdefs.h 385qt4/mkspecs/solaris-g++-64/qplatformdefs.h
367qt4/mkspecs/solaris-g++/qmake.conf 386qt4/mkspecs/solaris-g++/qmake.conf
368qt4/mkspecs/solaris-g++/qplatformdefs.h 387qt4/mkspecs/solaris-g++/qplatformdefs.h
369qt4/mkspecs/tru64-cxx/qmake.conf 388qt4/mkspecs/tru64-cxx/qmake.conf
370qt4/mkspecs/tru64-cxx/qplatformdefs.h 389qt4/mkspecs/tru64-cxx/qplatformdefs.h
371qt4/mkspecs/tru64-g++/qmake.conf 390qt4/mkspecs/tru64-g++/qmake.conf
372qt4/mkspecs/tru64-g++/qplatformdefs.h 391qt4/mkspecs/tru64-g++/qplatformdefs.h
373qt4/mkspecs/unixware-cc/qmake.conf 392qt4/mkspecs/unixware-cc/qmake.conf
374qt4/mkspecs/unixware-cc/qplatformdefs.h 393qt4/mkspecs/unixware-cc/qplatformdefs.h
375qt4/mkspecs/unixware-g++/qmake.conf 394qt4/mkspecs/unixware-g++/qmake.conf
376qt4/mkspecs/unixware-g++/qplatformdefs.h 395qt4/mkspecs/unixware-g++/qplatformdefs.h
 396qt4/mkspecs/win32-borland/qmake.conf
 397qt4/mkspecs/win32-borland/qplatformdefs.h
377qt4/mkspecs/win32-g++/qmake.conf 398qt4/mkspecs/win32-g++/qmake.conf
378qt4/mkspecs/win32-g++/qplatformdefs.h 399qt4/mkspecs/win32-g++/qplatformdefs.h
 400qt4/mkspecs/win32-icc/qmake.conf
 401qt4/mkspecs/win32-icc/qplatformdefs.h
379qt4/mkspecs/win32-msvc.net/qmake.conf 402qt4/mkspecs/win32-msvc.net/qmake.conf
380qt4/mkspecs/win32-msvc.net/qplatformdefs.h 403qt4/mkspecs/win32-msvc.net/qplatformdefs.h
381qt4/mkspecs/win32-msvc/features/incremental.prf 404qt4/mkspecs/win32-msvc/features/incremental.prf
382qt4/mkspecs/win32-msvc/features/incremental_off.prf 405qt4/mkspecs/win32-msvc/features/incremental_off.prf
383qt4/mkspecs/win32-msvc/qmake.conf 406qt4/mkspecs/win32-msvc/qmake.conf
384qt4/mkspecs/win32-msvc/qplatformdefs.h 407qt4/mkspecs/win32-msvc/qplatformdefs.h
385qt4/mkspecs/win32-msvc2002/qmake.conf 408qt4/mkspecs/win32-msvc2002/qmake.conf
386qt4/mkspecs/win32-msvc2002/qplatformdefs.h 409qt4/mkspecs/win32-msvc2002/qplatformdefs.h
387qt4/mkspecs/win32-msvc2003/qmake.conf 410qt4/mkspecs/win32-msvc2003/qmake.conf
388qt4/mkspecs/win32-msvc2003/qplatformdefs.h 411qt4/mkspecs/win32-msvc2003/qplatformdefs.h
389qt4/mkspecs/win32-msvc2005/qmake.conf 412qt4/mkspecs/win32-msvc2005/qmake.conf
390qt4/mkspecs/win32-msvc2005/qplatformdefs.h 413qt4/mkspecs/win32-msvc2005/qplatformdefs.h
391qt4/mkspecs/win32-msvc2008/qmake.conf 414qt4/mkspecs/win32-msvc2008/qmake.conf
392qt4/mkspecs/win32-msvc2008/qplatformdefs.h 415qt4/mkspecs/win32-msvc2008/qplatformdefs.h
 416qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
393qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf 417qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
394qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h 418qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
 419qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf
395qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf 420qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf
396qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h 421qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
 422qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
397qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf 423qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf
398qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h 424qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
 425qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf
399qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf 426qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf
400qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h 427qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
401qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf 428qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf
402qt4/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h 429qt4/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
403qt4/mkspecs/wince50standard-mipsiv-msvc2008/qmake.conf 430qt4/mkspecs/wince50standard-mipsiv-msvc2008/qmake.conf
404qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h 431qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
405qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf 432qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf
406qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h 433qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
407qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf 434qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf
408qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h 435qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
 436qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf
409qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf 437qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf
410qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h 438qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
 439qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf
411qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf 440qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf
412qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h 441qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
413qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf 442qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
414qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h 443qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
 444qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf
415qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf 445qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
416qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h 446qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
 447qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf
417qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf 448qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf
418qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h 449qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
 450qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf
419qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf 451qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf
420qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h 452qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
 453qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf
421qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf 454qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf
422qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h 455qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
 456qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf
423qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf 457qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf
424qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h 458qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
 459qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf
425qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf 460qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf
426qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h 461qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
 462qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf
427qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf 463qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf
428qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h 464qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
 465qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf
429qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf 466qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
430qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h 467qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
431qt4/phrasebooks/danish.qph 468qt4/phrasebooks/danish.qph
432qt4/phrasebooks/dutch.qph 469qt4/phrasebooks/dutch.qph
433qt4/phrasebooks/finnish.qph 470qt4/phrasebooks/finnish.qph
434qt4/phrasebooks/french.qph 471qt4/phrasebooks/french.qph
435qt4/phrasebooks/german.qph 472qt4/phrasebooks/german.qph
436qt4/phrasebooks/italian.qph 473qt4/phrasebooks/italian.qph
437qt4/phrasebooks/japanese.qph 474qt4/phrasebooks/japanese.qph
438qt4/phrasebooks/norwegian.qph 475qt4/phrasebooks/norwegian.qph
439qt4/phrasebooks/polish.qph 476qt4/phrasebooks/polish.qph
440qt4/phrasebooks/russian.qph 477qt4/phrasebooks/russian.qph
441qt4/phrasebooks/spanish.qph 478qt4/phrasebooks/spanish.qph
@@ -459,61 +496,69 @@ qt4/plugins/designer/libqt3supportwidget @@ -459,61 +496,69 @@ qt4/plugins/designer/libqt3supportwidget
459@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2008 496@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2008
460@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2005 497@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2005
461@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2008 498@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2008
462@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2005 499@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2005
463@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2008 500@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2008
464@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2005 501@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2005
465@dirrm qt4/mkspecs/win32-msvc2008 502@dirrm qt4/mkspecs/win32-msvc2008
466@dirrm qt4/mkspecs/win32-msvc2005 503@dirrm qt4/mkspecs/win32-msvc2005
467@dirrm qt4/mkspecs/win32-msvc2003 504@dirrm qt4/mkspecs/win32-msvc2003
468@dirrm qt4/mkspecs/win32-msvc2002 505@dirrm qt4/mkspecs/win32-msvc2002
469@dirrm qt4/mkspecs/win32-msvc/features 506@dirrm qt4/mkspecs/win32-msvc/features
470@dirrm qt4/mkspecs/win32-msvc.net 507@dirrm qt4/mkspecs/win32-msvc.net
471@dirrm qt4/mkspecs/win32-msvc 508@dirrm qt4/mkspecs/win32-msvc
 509@dirrm qt4/mkspecs/win32-icc
472@dirrm qt4/mkspecs/win32-g++ 510@dirrm qt4/mkspecs/win32-g++
 511@dirrm qt4/mkspecs/win32-borland
473@dirrm qt4/mkspecs/unixware-g++ 512@dirrm qt4/mkspecs/unixware-g++
474@dirrm qt4/mkspecs/unixware-cc 513@dirrm qt4/mkspecs/unixware-cc
475@dirrm qt4/mkspecs/tru64-g++ 514@dirrm qt4/mkspecs/tru64-g++
476@dirrm qt4/mkspecs/tru64-cxx 515@dirrm qt4/mkspecs/tru64-cxx
477@dirrm qt4/mkspecs/solaris-g++-64 516@dirrm qt4/mkspecs/solaris-g++-64
478@dirrm qt4/mkspecs/solaris-g++ 517@dirrm qt4/mkspecs/solaris-g++
479@dirrm qt4/mkspecs/solaris-cc-64 518@dirrm qt4/mkspecs/solaris-cc-64
480@dirrm qt4/mkspecs/solaris-cc 519@dirrm qt4/mkspecs/solaris-cc
481@dirrm qt4/mkspecs/sco-g++ 520@dirrm qt4/mkspecs/sco-g++
482@dirrm qt4/mkspecs/sco-cc 521@dirrm qt4/mkspecs/sco-cc
483@dirrm qt4/mkspecs/qws/solaris-generic-g++ 522@dirrm qt4/mkspecs/qws/solaris-generic-g++
484@dirrm qt4/mkspecs/qws/macx-generic-g++ 523@dirrm qt4/mkspecs/qws/macx-generic-g++
485@dirrm qt4/mkspecs/qws/linux-zylonite-g++ 524@dirrm qt4/mkspecs/qws/linux-zylonite-g++
486@dirrm qt4/mkspecs/qws/linux-x86_64-g++ 525@dirrm qt4/mkspecs/qws/linux-x86_64-g++
487@dirrm qt4/mkspecs/qws/linux-x86-g++ 526@dirrm qt4/mkspecs/qws/linux-x86-g++
488@dirrm qt4/mkspecs/qws/linux-sharp-g++ 527@dirrm qt4/mkspecs/qws/linux-sharp-g++
 528@dirrm qt4/mkspecs/qws/linux-sh4al-g++
 529@dirrm qt4/mkspecs/qws/linux-sh-g++
 530@dirrm qt4/mkspecs/qws/linux-ppc-g++
489@dirrm qt4/mkspecs/qws/linux-mips-g++ 531@dirrm qt4/mkspecs/qws/linux-mips-g++
490@dirrm qt4/mkspecs/qws/linux-lsb-g++ 532@dirrm qt4/mkspecs/qws/linux-lsb-g++
491@dirrm qt4/mkspecs/qws/linux-ipaq-g++ 533@dirrm qt4/mkspecs/qws/linux-ipaq-g++
492@dirrm qt4/mkspecs/qws/linux-generic-g++-32 534@dirrm qt4/mkspecs/qws/linux-generic-g++-32
493@dirrm qt4/mkspecs/qws/linux-generic-g++ 535@dirrm qt4/mkspecs/qws/linux-generic-g++
 536@dirrm qt4/mkspecs/qws/linux-dm800-g++
494@dirrm qt4/mkspecs/qws/linux-dm7000-g++ 537@dirrm qt4/mkspecs/qws/linux-dm7000-g++
495@dirrm qt4/mkspecs/qws/linux-cellon-g++ 538@dirrm qt4/mkspecs/qws/linux-cellon-g++
496@dirrm qt4/mkspecs/qws/linux-avr32-g++ 539@dirrm qt4/mkspecs/qws/linux-avr32-g++
 540@dirrm qt4/mkspecs/qws/linux-armv6-g++
497@dirrm qt4/mkspecs/qws/linux-arm-g++ 541@dirrm qt4/mkspecs/qws/linux-arm-g++
498@dirrm qt4/mkspecs/qws/freebsd-generic-g++ 542@dirrm qt4/mkspecs/qws/freebsd-generic-g++
499@dirrm qt4/mkspecs/qws 543@dirrm qt4/mkspecs/qws
500@dirrm qt4/mkspecs/openbsd-g++ 544@dirrm qt4/mkspecs/openbsd-g++
501@dirrm qt4/mkspecs/netbsd-g++ 545@dirrm qt4/mkspecs/netbsd-g++
502@dirrm qt4/mkspecs/macx-xlc 546@dirrm qt4/mkspecs/macx-xlc
503@dirrm qt4/mkspecs/macx-xcode 547@dirrm qt4/mkspecs/macx-xcode
504@dirrm qt4/mkspecs/macx-pbuilder 548@dirrm qt4/mkspecs/macx-pbuilder
505@dirrm qt4/mkspecs/macx-llvm 549@dirrm qt4/mkspecs/macx-llvm
506@dirrm qt4/mkspecs/macx-icc 550@dirrm qt4/mkspecs/macx-icc
 551@dirrm qt4/mkspecs/macx-g++42
507@dirrm qt4/mkspecs/macx-g++ 552@dirrm qt4/mkspecs/macx-g++
508@dirrm qt4/mkspecs/lynxos-g++ 553@dirrm qt4/mkspecs/lynxos-g++
509@dirrm qt4/mkspecs/linux-pgcc 554@dirrm qt4/mkspecs/linux-pgcc
510@dirrm qt4/mkspecs/linux-lsb-g++ 555@dirrm qt4/mkspecs/linux-lsb-g++
511@dirrm qt4/mkspecs/linux-llvm 556@dirrm qt4/mkspecs/linux-llvm
512@dirrm qt4/mkspecs/linux-kcc 557@dirrm qt4/mkspecs/linux-kcc
513@dirrm qt4/mkspecs/linux-icc-64 558@dirrm qt4/mkspecs/linux-icc-64
514@dirrm qt4/mkspecs/linux-icc-32 559@dirrm qt4/mkspecs/linux-icc-32
515@dirrm qt4/mkspecs/linux-icc 560@dirrm qt4/mkspecs/linux-icc
516@dirrm qt4/mkspecs/linux-g++-64 561@dirrm qt4/mkspecs/linux-g++-64
517@dirrm qt4/mkspecs/linux-g++-32 562@dirrm qt4/mkspecs/linux-g++-32
518@dirrm qt4/mkspecs/linux-g++ 563@dirrm qt4/mkspecs/linux-g++
519@dirrm qt4/mkspecs/linux-ecc-64 564@dirrm qt4/mkspecs/linux-ecc-64