update qmake to 1.05a

1 files changed, 8 insertions, 22 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 583b164..69e0c02 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __VCPROJMAKE_H__
-#define __VCPROJMAKE_H__
+#ifndef __MSVC_VCPROJ_H__
+#define __MSVC_VCPROJ_H__
 
@@ -48,2 +48,3 @@ enum target {
 
+struct QUuid;
 class VcprojGenerator : public Win32MakefileGenerator
@@ -70,2 +71,3 @@ protected:
     virtual void outputVariables();
+    QString fixFilename(QString ofile) const;
     
@@ -91,20 +93,2 @@ protected:
 
-    /*
-    void writeGuid( QTextStream &t );
-    void writeAdditionalOptions( QTextStream &t );
-    void writeHeaders( QTextStream &t );
-    void writeSources( QTextStream &t );
-    void writeMocs( QTextStream &t );
-    void writeLexs( QTextStream &t );
-    void writeYaccs( QTextStream &t );
-    void writePictures( QTextStream &t );
-    void writeImages( QTextStream &t );
-    void writeIDLs( QTextStream &t );
-
-    void writeForms( QTextStream &t );
-    void writeFormsSourceHeaders( QString &variable, QTextStream &t );
-    void writeTranslations( QTextStream &t );
-    void writeStrippedTranslations( QTextStream &t );
-    */
-
     VCProject vcProject;
@@ -112,2 +96,4 @@ protected:
 
+private:
+    QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;
@@ -128,2 +114,2 @@ inline bool VcprojGenerator::findLibraries()
 
-#endif /* __VCPROJMAKE_H__ */
+#endif /* __MSVC_VCPROJ_H__ */