[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-cygwin
Subject:    Re: Qt 3.3.4
From:       Peter_Kümmel <syntheticpp () gmx ! net>
Date:       2005-01-28 13:41:10
Message-ID: 41FA40F6.6000604 () gmx ! net
[Download RAW message or body]

Ralf Habacker wrote:
> Hi,
> we will upgrade soon, but we have to make sure, that we don't loose the 
> aalready applied patches.
> 
> regards
> Ralf

Ideally not changing original Trolltech files we should document all
nevertheless done patches of such files. Therefore I've added the file

patched-orig-files.txt

to cvs where everybody who changes original files or who knows about such
changes should add a notice.
Any comments?

Regards,
Peter

["patched-original-files.txt" (text/plain)]

This files documents changes of original Trolltech files.

Making our live more simple, patching original files should be 
avoided because such patches get lost when we upgrade the
Trolltech files.

If you nevertheless change Trolltech files 
1. you must have a very good reasons
2. you must document and explain your changes in this file
3. and you should add the diff against the original file (mail from the \
kde-cygwin--cvs list).



Version 3.3.3 changes 
*********************



*   qmake/makefile.cpp (Peter Kuemmel)
_________________________________________________________________________________________________________________________


qmake crashes when compiled with MSVC 8 beta 
(MSVC 8 don't likes NULL strings: error in open.c)
    
Index: makefile.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/makefile.cpp,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -r1.1.1.8 -r1.1.1.9
--- makefile.cpp	27 Aug 2004 21:08:23 -0000	1.1.1.8
+++ makefile.cpp	26 Nov 2004 14:33:04 -0000	1.1.1.9
@@ -113,6 +113,7 @@
 
     QString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, \
QDir::currentDirPath(), Option::output_dir));  
+	if ( !fn_local) fn_local = ""; // MSVC 8 don't likes NULL strings: error in open.c 
     int file = open(fn_local.latin1(), O_RDONLY);
     if(file == -1)
 	return FALSE;
@@ -248,6 +249,7 @@
 
     QStringList &fndeps = findDependencies(f);
     QString fn = fileFixify(f, QDir::currentDirPath(), Option::output_dir);
+    if ( !fn) fn = ""; // MSVC 8 don't likes NULL strings: error in open.c 
     fn = Option::fixPathToLocalOS(fn, FALSE);
     QString fix_env_fn = Option::fixPathToLocalOS(fn);
_________________________________________________________________________________________________________________________




_______________________________________________
kde-cygwin mailing list
kde-cygwin@kde.org
https://mail.kde.org/mailman/listinfo/kde-cygwin


[prev in list] [next in list] [prev in thread] [next in thread]