update qmake to 1.05a

1 files changed, 24 insertions, 26 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 2d09280..1dca68d 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -392,10 +392,8 @@ protected:
     VCToolBase(){};
-    ~VCToolBase(){};
+    virtual ~VCToolBase(){}
     virtual bool parseOption( const char* option ) = 0;
 public:
-    bool parseOptions( QStringList& options ) {
-        bool result = TRUE;
-        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()) && result; it++ )
-            result = parseOption( (*it).latin1() );
-        return result;
+    void parseOptions( QStringList& options ) {
+        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ )
+            parseOption( (*it).latin1() );
     }
@@ -411,4 +409,4 @@ public:
     VCCLCompilerTool();
-    ~VCCLCompilerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
     
@@ -482,4 +480,4 @@ public:
     VCLinkerTool();
-    ~VCLinkerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
 
@@ -547,4 +545,4 @@ public:
     VCMIDLTool();
-    ~VCMIDLTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
 
@@ -589,4 +587,4 @@ public:
     VCLibrarianTool();
-    ~VCLibrarianTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -610,4 +608,4 @@ public:
     VCCustomBuildTool();
-    ~VCCustomBuildTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -627,4 +625,4 @@ public:
     VCResourceCompilerTool();
-    ~VCResourceCompilerTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -647,4 +645,4 @@ protected:
     VCEventTool() : ExcludedFromBuild( unset ){};
-    ~VCEventTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -663,3 +661,3 @@ public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
@@ -670,3 +668,3 @@ public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
@@ -677,3 +675,3 @@ public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
@@ -685,3 +683,3 @@ public:
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
@@ -722,3 +720,3 @@ public:
     VCFilter();
-    ~VCFilter(){};
+    ~VCFilter(){}
     void generateMOC( QTextStream &strm, QString str ) const;
@@ -741,3 +739,3 @@ public:
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}