1 files changed, 140 insertions, 103 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index c2b9e30..7ffe4f7 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -251,33 +251,33 @@ const char* _WarnLevel 				= "\n\t\t\t\tWarnLevel=\"";
         const char* _WarningLevel               = "\n\t\t\t\tWarningLevel=\"";
         const char* _WholeProgramOptimization   = "\n\t\t\t\tWholeProgramOptimization=\"";
 
 // Property name and value as Pairs ---------------------------------
 struct TPair {
     TPair( const char* n, const triState v ) : name(n), value(v) {};
-    const char* name; 
-    const triState value; 
+    const char* name;
+    const triState value;
 };
-struct EPair { 
+struct EPair {
     EPair( const char* n, const int v ) : name(n), value(v) {};
-    const char* name; 
+    const char* name;
     const int value;
 };
-struct LPair { 
+struct LPair {
     LPair( const char* n, const long v ) : name(n), value(v) {};
-    const char* name; 
-    const long value; 
+    const char* name;
+    const long value;
 };
-struct SPair { 
+struct SPair {
     SPair( const char* n, const QString& v ) : name(n), value(v) {};
-    const char* name; 
-    const QString& value; 
+    const char* name;
+    const QString& value;
 };
-struct XPair { 
+struct XPair {
     XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {};
-    const char* name; 
+    const char* name;
     const QStringList& value;
     const char* sep;
 };
 
 // void streamSPair( QTextStream &strm, const char *n, const QString &s )
 
@@ -380,13 +380,13 @@ VCCLCompilerTool::VCCLCompilerTool()
 
 QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
 {
     strm << _begTool3;
     strm << _VCCLCompilerToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories );
     strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation );
             if ( tool.AssemblerOutput != asmListingNone )    strm << EPair( _AssemblerOutput, tool.AssemblerOutput );
     if ( tool.BasicRuntimeChecks != runtimeBasicCheckNone ) strm << EPair( _BasicRuntimeChecks, tool.BasicRuntimeChecks );
             if ( tool.BrowseInformation != brInfoNone )             strm << EPair( _BrowseInformation, tool.BrowseInformation );
     strm << SPair( _BrowseInformationFile, tool.BrowseInformationFile );
@@ -439,40 +439,44 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << XPair( _UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions );
     if ( !tool.PrecompiledHeaderFile.isEmpty() ||
          !tool.PrecompiledHeaderThrough.isEmpty() )
         strm << EPair( _UsePrecompiledHeader, tool.UsePrecompiledHeader );
     strm << TPair( _WarnAsError, tool.WarnAsError );
     strm << EPair( _WarningLevel, tool.WarningLevel );
-    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); 
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
     strm << "/>";
 return strm;
 }
 
 bool VCCLCompilerTool::parseOption( const char* option )
 {
     // skip index 0 ('/' or '-')
-    char first  = option[1]; 
+    char first  = option[1];
     char second = option[2];
     char third  = option[3];
     char fourth = option[4];
+    bool found = TRUE;
 
     switch ( first ) {
     case '?':
     case 'h':
         qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
-        return FALSE;
+        found = FALSE;
+        break;
     case '@':
         qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
-        return FALSE;
+        found = FALSE;
+        break;
     case 'l':
         qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
-        return FALSE;
-
+        found = FALSE;
+        break;
     case 'A':
-        if ( second != 'I' )
-            return FALSE;
+        if ( second != 'I' ) {
+            found = FALSE; break;
+        }
         AdditionalUsingDirectories += option+2;
         break;
     case 'C':
         KeepComments = _True;
         break;
     case 'D':
@@ -484,13 +488,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 // ExceptionHandling must be false, or it will override
                 // with an /EHsc option
                 ExceptionHandling = _False;
                 AdditionalOptions += option;
                 break;
             }
-            return FALSE;
+            found = FALSE; break;
         }
         GeneratePreprocessedFile = preprocessYes;
         break;
     case 'F':
         if ( second <= '9' && second >= '0' ) {
             AdditionalOptions += option;
@@ -541,22 +545,22 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 PrecompiledHeaderFile = option+3;
                 break;
             case 'x':
                 ExpandAttributedSource = _True;
                 break;
             default:
-                return FALSE;
+                found = FALSE; break;
             }
         }
         break;
     case 'G':
         switch ( second ) {
         case '3':
         case '4':
             qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
-            return FALSE;
+            found = FALSE; break;
         case '5':
             OptimizeForProcessor = procOptimizePentium;
             break;
         case '6':
         case 'B':
             OptimizeForProcessor = procOptimizePentiumProAndAbove;
@@ -616,13 +620,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
             EnableFunctionLevelLinking = _True;
             break;
         case 'z':
             CallingConvention = callConventionStdCall;
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'H':
         AdditionalOptions += option;
         break;
     case 'I':
@@ -630,13 +634,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
         break;
     case 'L':
         if ( second == 'D' ) {
             AdditionalOptions += option;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'M':
         if ( second == 'D' ) {
             RuntimeLibrary = rtMultiThreadedDLL;
             if ( third == 'd' )
                 RuntimeLibrary = rtMultiThreadedDebugDLL;
             break;
@@ -648,13 +652,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
         } else if ( second == 'T' ) {
             RuntimeLibrary = rtMultiThreaded;
             if ( third == 'd' )
                 RuntimeLibrary = rtMultiThreadedDebug;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'O':
         switch ( second ) {
         case '1':
             Optimization = optimizeMinSpace;
             break;
         case '2':
@@ -668,13 +672,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 InlineFunctionExpansion = expandDisable;
             else if ( third == '1' )
                 InlineFunctionExpansion = expandOnlyInline;
             else if ( third == '2' )
                 InlineFunctionExpansion = expandAnySuitable;
             else
-                return FALSE;
+                found = FALSE;
             break;
         case 'd':
             Optimization = optimizeDisabled;
             break;
         case 'g':
             GlobalOptimizations = _True;
@@ -702,46 +706,46 @@ bool VCCLCompilerTool::parseOption( const char* option )
         case 'y':
             OmitFramePointers = _True;
             if ( third == '-' )
                 OmitFramePointers = _False;
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'P':
         GeneratePreprocessedFile = preprocessYes;
         break;
     case 'Q':
         if ( second == 'I' ) {
             AdditionalOptions += option;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'R':
         if ( second == 'T' && third == 'C' ) {
             if ( fourth == '1' )
                 BasicRuntimeChecks = runtimeBasicCheckAll;
             else if ( fourth == 'c' )
                 SmallerTypeCheck = _True;
             else if ( fourth == 's' )
                 BasicRuntimeChecks = runtimeCheckStackFrame;
             else if ( fourth == 'u' )
                 BasicRuntimeChecks = runtimeCheckUninitVariables;
             else
-                return FALSE;
+                found = FALSE; break;
         }
         break;
     case 'T':
         if ( second == 'C' ) {
             CompileAs = compileAsC;
         } else if ( second == 'P' ) {
             CompileAs = compileAsCPlusPlus;
         } else {
             qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'U':
         UndefinePreprocessorDefinitions += option+2;
         break;
     case 'V':
@@ -775,13 +779,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
             if ( third == '6' && fourth == '4' ) {
                 Detect64BitPortabilityProblems = _True;
                 break;
             }
             // Fallthrough
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'X':
         IgnoreStandardIncludePath = _True;
         break;
     case 'Y':
@@ -804,13 +808,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         case 'u':
             UsePrecompiledHeader = pchUseUsingSpecific;
             PrecompiledHeaderFile = option+3;
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'Z':
         switch ( second ) {
         case '7':
             DebugInformationFormat = debugOldStyleInfo;
@@ -837,15 +841,15 @@ bool VCCLCompilerTool::parseOption( const char* option )
             if ( third == ':' ) {
                 if ( fourth == 'f' )
                     ForceConformanceInForLoopScope = _True;
                 else if ( fourth == 'w' )
                     TreatWChar_tAsBuiltInType = _True;
                 else
-                    return FALSE;
+                    found = FALSE;
             } else {
-                return FALSE;
+                found = FALSE; break;
             }
             break;
         case 'g':
         case 'm':
         case 's':
             AdditionalOptions += option;
@@ -866,17 +870,17 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 StructMemberAlignment = alignFourBytes;
                 break;
             case '8':
                 StructMemberAlignment = alignEightBytes;
                 break;
             default:
-                return FALSE;
+                found = FALSE; break;
             }
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'c':
         if ( second == '\0' ) {
             CompileOnly = _True;
         } else if ( second == 'l' ) {
@@ -884,45 +888,46 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 CompileAsManaged = managedAssembly;
                 TurnOffAssemblyGeneration = _True;
             } else {
                 CompileAsManaged = managedAssembly;
             }
         } else {
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'd':
-        if ( second != 'r' )
-            return FALSE;
+        if ( second != 'r' ) {
+            found = FALSE; break;
+        }
         CompileAsManaged = managedAssembly;
         break;
     case 'n':
         if ( second == 'o' && third == 'B' && fourth == 'o' ) {
             AdditionalOptions += "/noBool";
             break;
         }
         if ( second == 'o' && third == 'l' && fourth == 'o' ) {
             SuppressStartupBanner = _True;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 's':
         if ( second == 'h' && third == 'o' && fourth == 'w' ) {
             ShowIncludes = _True;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'u':
         UndefineAllPreprocessorDefinitions = _True;
         break;
     case 'v':
         if ( second == 'd' || second == 'm' ) {
             AdditionalOptions += option;
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'w':
         switch ( second ) {
         case '\0':
             WarningLevel = warningLevel_0;
             break;
         case 'd':
@@ -930,14 +935,16 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         default:
             AdditionalOptions += option;
         }
         break;
     default:
-        return FALSE;
+        found = FALSE; break;
     }
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
     return TRUE;
 }
 
 // VCLinkerTool -----------------------------------------------------
 VCLinkerTool::VCLinkerTool()
             :EnableCOMDATFolding( optFoldingDefault ),
@@ -977,13 +984,13 @@ VCLinkerTool::VCLinkerTool()
 QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool )
 {
     strm << _begTool3;
     strm << _VCLinkerToolName;
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly );
     strm << SPair( _BaseAddress, tool.BaseAddress );
     strm << XPair( _DelayLoadDLLs, tool.DelayLoadDLLs );
     if ( tool.EnableCOMDATFolding != optFoldingDefault )    strm << EPair( _EnableCOMDATFolding, tool.EnableCOMDATFolding );
     strm << SPair( _EntryPointSymbol, tool.EntryPointSymbol );
     strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
@@ -1043,65 +1050,69 @@ static uint elfHash( const char* name )
     const uchar *k;
     uint h = 0;
     uint g;
 
     if ( name ) {
         k = (const uchar *) name;
-        while ( (*k) && 
-                (*k)!= ':' && 
+        while ( (*k) &&
+                (*k)!= ':' &&
                 (*k)!=',' &&
                 (*k)!=' ' ) {
             h = ( h << 4 ) + *k++;
             if ( (g = (h & 0xf0000000)) != 0 )
                 h ^= g >> 24;
             h &= ~g;
         }
     }
     if ( !h )
         h = 1;
     return h;
 }
+
+//#define USE_DISPLAY_HASH
+#ifdef USE_DISPLAY_HASH
 static void displayHash( const char* str )
 {
     printf( "case 0x%07x: // %s\n    break;\n", elfHash(str), str );
 }
+#endif
 
 bool VCLinkerTool::parseOption( const char* option )
 {
-#if 0
+#ifdef USE_DISPLAY_HASH
     // Main options
-    displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" ); 
-    displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" ); 
-    displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" ); 
-    displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" ); 
-    displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" ); 
-    displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" ); 
-    displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" ); 
-    displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" ); 
-    displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" ); 
-    displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" ); 
-    displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" ); 
-    displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" ); 
-    displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" ); 
-    displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" ); 
-    displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" ); 
-    displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" ); 
-    displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" ); 
+    displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" );
+    displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" );
+    displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" );
+    displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" );
+    displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" );
+    displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" );
+    displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" );
+    displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" );
+    displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" );
+    displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" );
+    displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" );
+    displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" );
+    displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" );
+    displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" );
+    displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" );
+    displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" );
+    displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" );
     displayHash( "/VXD" ); displayHash( "/WS " );
 #endif
-#if 0
+#ifdef USE_DISPLAY_HASH
     // Sub options
     displayHash( "UNLOAD" ); displayHash( "NOBIND" ); displayHash( "no" ); displayHash( "NOSTATUS" ); displayHash( "STATUS" );
-    displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" ); 
-    displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" ); 
-    displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" ); 
-    displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" ); 
-    displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" ); 
-    displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" ); 
+    displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" );
+    displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" );
+    displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" );
+    displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" );
+    displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" );
+    displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" );
 #endif
-
+    bool found = TRUE;
     switch ( elfHash(option) ) {
     case 0x3360dbe: // /ALIGN[:number]
     case 0x1485c34: // /ALLOWBIND[:NO]
     case 0x6b21972: // /DEFAULTLIB:library
     case 0x396ea92: // /DRIVER[:UPONLY | :WDM]
     case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386]
@@ -1138,13 +1149,13 @@ bool VCLinkerTool::parseOption( const char* option )
         AdditionalOptions += option;
         break;
     case 0x06f4bf4: // /DELAYLOAD:dllname
         DelayLoadDLLs += option+11;
         break;
     // case 0x003390c: // /DLL
-    // This option is not used for vcproj files 
+    // This option is not used for vcproj files
             //break;
     case 0x33a3979: // /ENTRY:function
         EntryPointSymbol = option+7;
         break;
     case 0x033c960: // /HEAP:reserve[,commit]
         {
@@ -1189,13 +1200,13 @@ bool VCLinkerTool::parseOption( const char* option )
         if ( *(option+5) == ':' &&
              *(option+6) == 'S' )
              ShowProgress = linkProgressAll;
         break;
     case 0x157cf65: // /MACHINE:{AM33|ARM|CEE|IA64|X86|M32R|MIPS|MIPS16|MIPSFPU|MIPSFPU16|MIPSR41XX|PPC|SH3|SH4|SH5|THUMB|TRICORE}
         switch ( elfHash(option+9) ) {
-            // Very limited documentation on all options but X86, 
+            // Very limited documentation on all options but X86,
             // so we put the others in AdditionalOptions...
         case 0x0046063: // AM33
         case 0x000466d: // ARM
         case 0x0004795: // CEE
         case 0x004d494: // IA64
         case 0x0050672: // M32R
@@ -1213,13 +1224,13 @@ bool VCLinkerTool::parseOption( const char* option )
             AdditionalOptions += option;
             break;
         case 0x0005bb6: // X86
             TargetMachine = machineX86;
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
     case 0x0034160: // /MAP[:filename]
         GenerateMapFile = _True;
         MapFileName = option+5;
         break;
@@ -1272,13 +1283,13 @@ bool VCLinkerTool::parseOption( const char* option )
                 OptimizeForWindows98 = optWin98Yes;
                 break;
             case 'W': // NOWIN98
                 OptimizeForWindows98 = optWin98No;
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
         break;
     case 0x34468a2: // /ORDER:@filename
         FunctionOrder = option+8;
         break;
@@ -1321,23 +1332,23 @@ bool VCLinkerTool::parseOption( const char* option )
             case 0x5268ea5: // NATIVE
             case 0x05547e8: // POSIX
             case 0x2949c95: // WINDOWSCE
                 AdditionalOptions += option;
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
         break;
     case 0x8b654de: // /SWAPRUN:{NET | CD}
         if ( *(option+9) == 'N' )
             SwapRunFromNet = _True;
         else if ( *(option+9) == 'C' )
             SwapRunFromCD = _True;
         else
-            return FALSE;
+            found = FALSE;
         break;
     case 0x34906d4: // /TLBID:id
         TypeLibraryResourceID = QString( option+7 ).toLong();
         break;
     case 0x4907494: // /TLBOUT:[path\]filename
         TypeLibraryFile = option+8;
@@ -1357,15 +1368,17 @@ bool VCLinkerTool::parseOption( const char* option )
         }
         break;
     case 0xaa77f7e: // /VERSION:major[.minor]
         Version = option+9;
         break;
     default:
-        return FALSE;
+        found = FALSE;
     }
-    return TRUE;
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
+    return found;
 }
 
 // VCMIDLTool -------------------------------------------------------
 VCMIDLTool::VCMIDLTool()
             :DefaultCharType( midlCharUnsigned ),
         EnableErrorChecks( midlDisableAll ),
@@ -1389,13 +1402,13 @@ VCMIDLTool::VCMIDLTool()
 
 QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
 {
     strm << _begTool3;
     strm << _VCMIDLToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _CPreprocessOptions, tool.CPreprocessOptions );
     strm << EPair( _DefaultCharType, tool.DefaultCharType );
     strm << SPair( _DLLDataFileName, tool.DLLDataFileName );
     strm << EPair( _EnableErrorChecks, tool.EnableErrorChecks );
     strm << TPair( _ErrorCheckAllocations, tool.ErrorCheckAllocations );
     strm << TPair( _ErrorCheckBounds, tool.ErrorCheckBounds );
@@ -1424,40 +1437,41 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
     strm << "/>";
     return strm;
 }
 
 bool VCMIDLTool::parseOption( const char* option )
 {
-#if 0
+#ifdef USE_DISPLAY_HASH
     displayHash( "/D name[=def]" ); displayHash( "/I directory-list" ); displayHash( "/Oi" );
     displayHash( "/Oic" ); displayHash( "/Oicf" ); displayHash( "/Oif" ); displayHash( "/Os" );
     displayHash( "/U name" ); displayHash( "/WX" ); displayHash( "/W{0|1|2|3|4}" );
     displayHash( "/Zp {N}" ); displayHash( "/Zs" ); displayHash( "/acf filename" );
     displayHash( "/align {N}" ); displayHash( "/app_config" ); displayHash( "/c_ext" );
     displayHash( "/char ascii7" ); displayHash( "/char signed" ); displayHash( "/char unsigned" );
     displayHash( "/client none" ); displayHash( "/client stub" ); displayHash( "/confirm" );
-    displayHash( "/cpp_cmd cmd_line" ); displayHash( "/cpp_opt options" ); 
+    displayHash( "/cpp_cmd cmd_line" ); displayHash( "/cpp_opt options" );
     displayHash( "/cstub filename" ); displayHash( "/dlldata filename" ); displayHash( "/env win32" );
     displayHash( "/env win64" ); displayHash( "/error all" ); displayHash( "/error allocation" );
     displayHash( "/error bounds_check" ); displayHash( "/error enum" ); displayHash( "/error none" );
     displayHash( "/error ref" ); displayHash( "/error stub_data" ); displayHash( "/h filename" );
     displayHash( "/header filename" ); displayHash( "/iid filename" ); displayHash( "/lcid" );
     displayHash( "/mktyplib203" ); displayHash( "/ms_ext" ); displayHash( "/ms_union" );
     displayHash( "/msc_ver <nnnn>" ); displayHash( "/newtlb" ); displayHash( "/no_cpp" );
     displayHash( "/no_def_idir" ); displayHash( "/no_default_epv" ); displayHash( "/no_format_opt" );
     displayHash( "/no_warn" ); displayHash( "/nocpp" ); displayHash( "/nologo" ); displayHash( "/notlb" );
-    displayHash( "/o filename" ); displayHash( "/oldnames" ); displayHash( "/oldtlb" ); 
+    displayHash( "/o filename" ); displayHash( "/oldnames" ); displayHash( "/oldtlb" );
     displayHash( "/osf" ); displayHash( "/out directory" ); displayHash( "/pack {N}" );
     displayHash( "/prefix all" ); displayHash( "/prefix client" ); displayHash( "/prefix server" );
     displayHash( "/prefix switch" ); displayHash( "/protocol all" ); displayHash( "/protocol dce" );
     displayHash( "/protocol ndr64" ); displayHash( "/proxy filename" ); displayHash( "/robust" );
     displayHash( "/rpcss" ); displayHash( "/savePP" ); displayHash( "/server none" );
     displayHash( "/server stub" ); displayHash( "/sstub filename" ); displayHash( "/syntax_check" );
     displayHash( "/target {system}" ); displayHash( "/tlb filename" ); displayHash( "/use_epv" );
     displayHash( "/win32" ); displayHash( "/win64" );
 #endif
+    bool found = TRUE;
     int offset = 0;
     switch( elfHash(option) ) {
     case 0x0000334: // /D name[=def]
         PreprocessorDefinitions += option+3;
         break;
     case 0x0000339: // /I directory-list
@@ -1487,13 +1501,13 @@ bool VCMIDLTool::parseOption( const char* option )
             StructMemberAlignment = midlAlignFourBytes;
             break;
         case '8':
             StructMemberAlignment = midlAlignEightBytes;
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
     case 0x0359e82: // /char {ascii7|signed|unsigned}
         switch( *(option+6) ) {
         case 'a':
             DefaultCharType = midlCharAscii7;
@@ -1502,13 +1516,13 @@ bool VCMIDLTool::parseOption( const char* option )
             DefaultCharType = midlCharSigned;
             break;
         case 'u':
             DefaultCharType = midlCharUnsigned;
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
     case 0xa766524: // /cpp_opt options
         CPreprocessOptions += option+9;
         break;
     case 0xb32abf1: // /dlldata filename
@@ -1533,19 +1547,19 @@ bool VCMIDLTool::parseOption( const char* option )
             ErrorCheckEnumRange = _True;
             break;
         case 'n':
             EnableErrorChecks = midlDisableAll;
             break;
         case 'r':
-            break;
             ErrorCheckRefPointers = _True;
-        case 's':
             break;
+        case 's':
             ErrorCheckStubData = _True;
+            break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
     case 0x5eb7af2: // /header filename
         offset = 5;
     case 0x0000358: // /h filename
         HeaderFileName = option + offset + 3;
@@ -1644,17 +1658,19 @@ bool VCMIDLTool::parseOption( const char* option )
                 WarningLevel = midlWarningLevel_3;
                 break;
             case '4':
                 WarningLevel = midlWarningLevel_4;
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
         break;
     }
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
     return TRUE;
 }
 
 // VCLibrarianTool --------------------------------------------------
 VCLibrarianTool::VCLibrarianTool()
             :IgnoreAllDefaultLibraries( unset ),
@@ -1665,13 +1681,13 @@ VCLibrarianTool::VCLibrarianTool()
 QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool )
 {
     strm << _begTool3;
     strm << SPair( _ToolName, QString( "VCLibrarianTool" ) );
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions );
     strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
     strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries );
     strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames );
     strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile );
     strm << SPair( _OutputFile, tool.OutputFile );
@@ -1711,13 +1727,13 @@ VCResourceCompilerTool::VCResourceCompilerTool()
 QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool )
 {
     strm << _begTool3;
     strm << _VCResourceCompilerToolName;
     strm << SPair( _ToolPath, tool.ToolPath );
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
             if ( tool.Culture != rcUseDefault )                     strm << EPair( _Culture, tool.Culture );
     strm << XPair( _FullIncludePath, tool.FullIncludePath );
     strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath );
     strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions );
     strm << SPair( _ResourceOutputFileName, tool.ResourceOutputFileName );
             if ( tool.ShowProgress != linkProgressNotSet )    strm << EPair( _ShowProgress, tool.ShowProgress );
@@ -1848,35 +1864,56 @@ void VCFilter::generateMOC( QTextStream &strm, QString str ) const
 void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
 {
     QString uicApp = Project->var("QMAKE_UIC");
     QString mocApp = Project->var( "QMAKE_MOC" );
     QString fname = str.section( '\\', -1 );
     QString mocDir = Project->var( "MOC_DIR" );
+    QString uiDir = Project->var( "UI_DIR" );
+    QString uiHeaders;
+    QString uiSources;
+
+    // Determining the paths for the output files.
+    int slash = str.findRev( '\\' );
+    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" );
+    if( !uiDir.isEmpty() ) {
+        uiHeaders = uiDir;
+        uiSources = uiDir;
+    } else {
+        uiHeaders = Project->var( "UI_HEADERS_DIR" );
+        uiSources = Project->var( "UI_SOURCES_DIR" );
+        if( uiHeaders.isEmpty() )
+            uiHeaders = pname;
+        if( uiSources.isEmpty() )
+            uiSources = pname;
+    }
+    if( !uiHeaders.endsWith( "\\" ) )
+        uiHeaders += "\\";
+    if( !uiSources.endsWith( "\\" ) )
+        uiSources += "\\";
+
+    // Determine the file name.
     int dot = fname.findRev( '.' );
-    if( dot != -1 ) 
+    if( dot != -1 )
         fname.truncate( dot );
 
-    int slash = str.findRev( '\\' );  
-    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString(".\\");
-
     strm << _begFileConfiguration;
     strm << _Name5;
     strm << Config->Name;
     strm << "\">";
     strm << _begTool5;
     strm << _VCCustomBuildTool;
     strm << _Description6;
     strm << "Uic'ing " << str << "...\"";
     strm << _CommandLine6;
-            strm << uicApp << " " << str << " -o " << pname << fname << ".h &amp;&amp; ";                       // Create .h from .ui file
-            strm << uicApp << " " << str << " -i " << fname << ".h -o " << pname << fname << ".cpp &amp;&amp; ";// Create .cpp from .ui file
-    strm << mocApp << " " << pname << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
+            strm << uicApp << " " << str << " -o " << uiHeaders << fname << ".h &amp;&amp; ";                   // Create .h from .ui file
+            strm << uicApp << " " << str << " -i " << fname << ".h -o " << uiSources << fname << ".cpp &amp;&amp; ";// Create .cpp from .ui file
+    strm << mocApp << " " << uiHeaders << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
     strm << _AdditionalDependencies6;
     strm << mocApp << ";" << uicApp << "\"";
     strm << _Outputs6;
-    strm << pname << fname << ".h;" << pname << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
+    strm << uiHeaders << fname << ".h;" << uiSources << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
     strm << "/>";
     strm << _endFileConfiguration;
 }
 
 QTextStream &operator<<( QTextStream &strm, const VCFilter &tool )
 {
@@ -1903,15 +1940,15 @@ QTextStream &operator<<( QTextStream &strm, const VCFilter &tool )
     return strm;
 }
 
 // VCProject --------------------------------------------------------
 VCProject::VCProject()
 {
-    QUuid uniqueId;
 #if defined(Q_WS_WIN32)
     GUID guid;
+    QUuid uniqueId;
     HRESULT h = CoCreateGuid( &guid );
     if ( h == S_OK )
         uniqueId = QUuid( guid );
     ProjectGUID = uniqueId.toString();
 #else
     // Qt doesn't support GUID on other platforms yet