Manually updatet to qmake1.06a which includes support for precompiled

headers.
Opies 'PRO' keyword was already reintroduced

1 files changed, 29 insertions, 14 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 1dca68d..9ce38d2 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -1,10 +1,10 @@
 /****************************************************************************
-** $Id$
 **
-** Definition of ________ class.
 **
-** Copyright (C) 2002 Trolltech AS.  All rights reserved.
+** Definition of VCProject class.
 **
-** This file is part of the network module of the Qt GUI Toolkit.
+** Copyright (C) 2002-2003 Trolltech AS.  All rights reserved.
+**
+** This file is part of qmake.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -33,4 +33,5 @@
 **
 **********************************************************************/
+
 #ifndef __MSVC_OBJECTMODEL_H__
 #define __MSVC_OBJECTMODEL_H__
@@ -57,5 +58,6 @@ enum customBuildCheck {
     moc,
     uic,
-    lexyacc
+    lexyacc,
+    resource
 };
 enum triState {
@@ -115,4 +117,5 @@ enum ConfigurationTypes {
 };
 enum debugOption {
+    debugUnknown = -1,
     debugDisabled,
     debugOldStyleInfo,
@@ -241,5 +244,6 @@ enum inlineExpansionOption {
     expandDisable,
     expandOnlyInline,
-    expandAnySuitable
+    expandAnySuitable,
+    expandDefault // Not useful number, but stops the output
 };
 enum linkIncrementalType {
@@ -297,5 +301,6 @@ enum optimizeOption {
     optimizeMaxSpeed,
     optimizeFull,
-    optimizeCustom
+    optimizeCustom,
+    optimizeDefault // Not useful number, but stops the output
 };
 enum optRefType {
@@ -316,4 +321,5 @@ enum pchOption {
 };
 enum preprocessOption {
+    preprocessUnknown = -1,
     preprocessNo,
     preprocessYes,
@@ -331,4 +337,5 @@ enum RemoteDebuggerType {
 };
 enum runtimeLibraryOption {
+    rtUnknown = -1,
     rtMultiThreaded,
     rtMultiThreadedDebug,
@@ -380,4 +387,5 @@ enum useOfMfc {
 };
 enum warningLevelOption {
+    warningLevelUnknown = -1,
     warningLevel_0,
     warningLevel_1,
@@ -612,7 +620,7 @@ public:
     // Variables
     QStringList		    AdditionalDependencies;
-    QString		    CommandLine;
+    QStringList		    CommandLine;
     QString		    Description;
-    QString		    Outputs;
+    QStringList		    Outputs;
     QString		    ToolName;
     QString		    ToolPath;
@@ -720,6 +728,8 @@ public:
     VCFilter();
     ~VCFilter(){}
-    void generateMOC( QTextStream &strm, QString str ) const;
-    void generateUIC( QTextStream &strm, const QString& str ) const;
+    void addMOCstage( QTextStream &strm, QString str );
+    void addUICstage( QTextStream &strm, QString str );
+    bool addIMGstage( QTextStream &strm, QString str );
+    void modifyPCHstage( QTextStream &strm, QString str );
 
     // Variables
@@ -729,6 +739,11 @@ public:
     QStringList		Files;
     VcprojGenerator*	Project;
-    VCConfiguration*	Config;
+    QValueList<VCConfiguration> *Config;
     customBuildCheck	CustomBuild;
+    bool		useCustomBuildTool;
+    VCCustomBuildTool   CustomBuildTool;
+    bool		useCompilerTool;
+    VCCLCompilerTool    CompilerTool;
+    bool		flat_files;
 };
 
@@ -749,5 +764,5 @@ public:
 
     // XML sub-parts
-    VCConfiguration	Configuration;
+    QValueList<VCConfiguration> Configuration;
     VCFilter		SourceFiles;
     VCFilter		HeaderFiles;
@@ -768,5 +783,5 @@ QTextStream &operator<<( QTextStream &, const VCResourceCompilerTool & );
 QTextStream &operator<<( QTextStream &, const VCEventTool & );
 QTextStream &operator<<( QTextStream &, const VCConfiguration & );
-QTextStream &operator<<( QTextStream &, const VCFilter & );
+QTextStream &operator<<( QTextStream &, VCFilter & );
 QTextStream &operator<<( QTextStream &, const VCProject & );