[Kde-cygwin-cvs] CVS: qt-3/qmake Makefile.win32-g++,1.1.1.6,1.1.1.7 option.cpp,1.1.1.11,1.1.1.12 project.cpp,1.1.1.13,1.1.1.14

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

Update of /cvsroot/kde-cygwin/qt-3/qmake
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/qmake

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	Makefile.win32-g++ option.cpp project.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: Makefile.win32-g++
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/Makefile.win32-g++,v
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -r1.1.1.6 -r1.1.1.7
--- Makefile.win32-g++	22 Sep 2005 12:57:27 -0000	1.1.1.6
+++ Makefile.win32-g++	30 Sep 2005 16:58:31 -0000	1.1.1.7
@@ -1,7 +1,7 @@
 #
 # specific stuff for mingw g++ make
 #
-CXX	    =	g++
+CXX	    =	mingw32-g++
 CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
 		-I..\mkspecs\win32-g++ \

Index: option.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/option.cpp,v
retrieving revision 1.1.1.11
retrieving revision 1.1.1.12
diff -u -r1.1.1.11 -r1.1.1.12
--- option.cpp	22 Sep 2005 12:57:27 -0000	1.1.1.11
+++ option.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.12
@@ -499,6 +499,9 @@
 	fixEnvVariables(tmp);
     if(canonical)
 	tmp = fixPath(tmp);
+	
+	if (!tmp) tmp = "";// MSVC 8 beta  don't likes NULL strings: error in open.c 
+	
 #if defined(Q_OS_WIN32)
     return tmp.replace('/', '\\');
 #else

Index: project.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/project.cpp,v
retrieving revision 1.1.1.13
retrieving revision 1.1.1.14
diff -u -r1.1.1.13 -r1.1.1.14
--- project.cpp	22 Sep 2005 12:57:27 -0000	1.1.1.13
+++ project.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.14
@@ -695,8 +695,18 @@
     if(x.isEmpty())
 	return TRUE;
 
-    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
-	Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
+    QRegExp re(x, FALSE, TRUE);
+    QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
+						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
+
+    bool crossCompileWin = Option::target_mode == Option::TARG_UNIX_MODE
+    	&& spec.find("win32") == 0  ? 1 : 0;
+
+    if (crossCompileWin && Option::target_mode == Option::TARG_UNIX_MODE && x == "win32")
+	return TRUE;
+    if(!crossCompileWin && Option::target_mode == Option::TARG_UNIX_MODE && x == "unix")
+	return TRUE;
+    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE) && x == "unix")
 	return TRUE;
     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
 	return TRUE;
@@ -711,9 +721,6 @@
 	return TRUE;
 
 
-    QRegExp re(x, FALSE, TRUE);
-    QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
-						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
     if((regex && re.exactMatch(spec)) || (!regex && spec == x))
 	return TRUE;
 #ifdef Q_OS_UNIX