Qt 3.0.5 patch

Fabien Steinmetz fabien.st at netcourrier.com
Wed Aug 14 15:13:19 PDT 2002


Hi

So here is a copy/paste of the patch trolltech sent me.
However I tried applying it (even manually by modifying
the lines) and it still doesn't seem to work. Maybe some
of you can work it out.

Fabien
mailto:fabien.st at netcourrier.com



==== //depot/qt/3.0/qmake/generators/makefile.cpp#88 (text) ====

@@ -1471,7 +1471,8 @@
  		    QFileInfo fi(file);
  		    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" :
"$(COPY_FILE)") +
  	 
	      " \"" + Option::fixPathToTargetOS(fi.filePath(), FALSE) + "\" \""
+ dst + "\"\n";
- 
	    if(!fi.isDir() && fi.isExecutable() &&
!project->isEmpty("QMAKE_STRIP"))
+ 
	    if(project->isActiveConfig("release") &&
+ 
	       !fi.isDir() && fi.isExecutable() &&
!project->isEmpty("QMAKE_STRIP"))
  	 
	target += QString("\t") + var("QMAKE_STRIP") + " \"" + dst + "\"\n";
  		    uninst.append(QString("-$(DEL_FILE) -r") + " \"" + dst +
fi.fileName() + "\"");
  		    continue;
@@ -1498,7 +1499,8 @@
  		    QFileInfo fi(file);
  		    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" :
"$(COPY_FILE)") +
  	 
	      " \"" + Option::fixPathToTargetOS(fi.filePath(), FALSE) + "\" \""
+ dst + "\"\n";
- 
	    if(!fi.isDir() && fi.isExecutable() &&
!project->isEmpty("QMAKE_STRIP"))
+ 
	    if(project->isActiveConfig("release") &&
+ 
	       !fi.isDir() && fi.isExecutable() &&
!project->isEmpty("QMAKE_STRIP"))
  	 
	target += QString("\t") + var("QMAKE_STRIP") + " \"" + dst + "\"\n";
  		}
  	    }

-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe blfs-dev' in the subject header of the message



More information about the blfs-dev mailing list