[Qtwin-cvs] CVS: qt-4/mkspecs/macx-xcode qmake.conf,1.1,1.2 qplatformdefs.h,1.2,1.3

[Christian E. <che...@us...>]

Update of /cvsroot/qtwin/qt-4/mkspecs/macx-xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10262/mkspecs/macx-xcode

Modified Files:
	qmake.conf qplatformdefs.h 
Log Message:
4.0.1->4.1.0rc1

Index: qmake.conf
===================================================================
RCS file: /cvsroot/qtwin/qt-4/mkspecs/macx-xcode/qmake.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qmake.conf	2 Jul 2005 20:14:47 -0000	1.1
+++ qmake.conf	14 Dec 2005 06:48:33 -0000	1.2
@@ -10,9 +10,9 @@
 QT			+= core gui
 QMAKE_COMPILER_DEFINES  += __APPLE__ __GNUC__
 
-QMAKE_CC		= 
+QMAKE_CC		=
 QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		= 
+QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_RESOURCE		= /Developer/Tools/Rez
@@ -26,7 +26,7 @@
 QMAKE_EXTENSION_SHLIB	= dylib
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
-QMAKE_CXX		= 
+QMAKE_CXX		=
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
@@ -38,7 +38,7 @@
 
 QMAKE_INCDIR		= /usr/local/include \
 	/System/Library/Frameworks/CarbonCore.framework/Headers 
-QMAKE_LIBDIR		= 
+QMAKE_LIBDIR		=
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
@@ -49,7 +49,7 @@
 QMAKE_LFLAGS		= -headerpad_max_install_names
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_APP	= 
+QMAKE_LFLAGS_APP	=
 QMAKE_LFLAGS_SHLIB	= -single_module -dynamiclib
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB

Index: qplatformdefs.h
===================================================================
RCS file: /cvsroot/qtwin/qt-4/mkspecs/macx-xcode/qplatformdefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qplatformdefs.h	22 Sep 2005 12:18:51 -0000	1.2
+++ qplatformdefs.h	14 Dec 2005 06:48:33 -0000	1.3
@@ -30,6 +30,9 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
 
 #define QT_FOPEN                ::fopen
 #define QT_FSEEK                ::fseeko