Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 43 |
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,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** -** Definition of ________ class. +** Definition of VCProject class. ** -** Copyright (C) 2002 Trolltech AS. All rights reserved. +** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. ** -** This file is part of the network module of the Qt GUI Toolkit. +** This file is part of qmake. ** @@ -34,2 +34,3 @@ **********************************************************************/ + #ifndef __MSVC_OBJECTMODEL_H__ @@ -58,3 +59,4 @@ enum customBuildCheck { uic, - lexyacc + lexyacc, + resource }; @@ -116,2 +118,3 @@ enum ConfigurationTypes { enum debugOption { + debugUnknown = -1, debugDisabled, @@ -242,3 +245,4 @@ enum inlineExpansionOption { expandOnlyInline, - expandAnySuitable + expandAnySuitable, + expandDefault // Not useful number, but stops the output }; @@ -298,3 +302,4 @@ enum optimizeOption { optimizeFull, - optimizeCustom + optimizeCustom, + optimizeDefault // Not useful number, but stops the output }; @@ -317,2 +322,3 @@ enum pchOption { enum preprocessOption { + preprocessUnknown = -1, preprocessNo, @@ -332,2 +338,3 @@ enum RemoteDebuggerType { enum runtimeLibraryOption { + rtUnknown = -1, rtMultiThreaded, @@ -381,2 +388,3 @@ enum useOfMfc { enum warningLevelOption { + warningLevelUnknown = -1, warningLevel_0, @@ -613,5 +621,5 @@ public: QStringList AdditionalDependencies; - QString CommandLine; + QStringList CommandLine; QString Description; - QString Outputs; + QStringList Outputs; QString ToolName; @@ -721,4 +729,6 @@ public: ~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 ); @@ -730,4 +740,9 @@ public: VcprojGenerator* Project; - VCConfiguration* Config; + QValueList<VCConfiguration> *Config; customBuildCheck CustomBuild; + bool useCustomBuildTool; + VCCustomBuildTool CustomBuildTool; + bool useCompilerTool; + VCCLCompilerTool CompilerTool; + bool flat_files; }; @@ -750,3 +765,3 @@ public: // XML sub-parts - VCConfiguration Configuration; + QValueList<VCConfiguration> Configuration; VCFilter SourceFiles; @@ -769,3 +784,3 @@ QTextStream &operator<<( QTextStream &, const VCEventTool & ); QTextStream &operator<<( QTextStream &, const VCConfiguration & ); -QTextStream &operator<<( QTextStream &, const VCFilter & ); +QTextStream &operator<<( QTextStream &, VCFilter & ); QTextStream &operator<<( QTextStream &, const VCProject & ); |