RefreshMocStep: Handle "standalone" header files containing Q_OBJECT properly

RefreshMocStep bailed out when it tried to obtain the cpp file's (that
does not exist) configuration in order to find includes, defines and pch
options. In order to be able to get these values (if applicable)
they are now fetched from the project configuration just like it is done
in AddMocStep.

Task-number: QTVSADDINBUG-399
Change-Id: I35ba5e29663e654e860fd3b3ec47d9be52eeda91
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 17 insertions, 5 deletions

diff --git a/Qt4VS2003/QtProjectLib/QtProject.cs b/Qt4VS2003/QtProjectLib/QtProject.cs
index fee026c3..bd5de8bc 100644
--- a/Qt4VS2003/QtProjectLib/QtProject.cs
+++ b/Qt4VS2003/QtProjectLib/QtProject.cs
@@ -2807,9 +2807,21 @@ namespace Digia.Qt5ProjectLib
                     bool mocableIsCPP = (srcMocFile == cppFile);
 
                     string pchParameters = null;
-                    VCFileConfiguration cppConfig = GetVCFileConfigurationByName(cppFile, config.Name);
-                    CompilerToolWrapper compiler = CompilerToolWrapper.Create(cppConfig);
-                    if (compiler.GetUsePrecompiledHeader() != pchOption.pchNone)
+                    VCFileConfiguration defineIncludeConfig = null;
+                    CompilerToolWrapper compiler = null;
+                    if (cppFile == null)
+                    {
+                        // No file specific defines/includes but at least the project defines/includes are added
+                        defineIncludeConfig = config;
+                        compiler = CompilerToolWrapper.Create(config.ProjectConfiguration as VCConfiguration);
+                    }
+                    else
+                    {
+                        defineIncludeConfig = GetVCFileConfigurationByName(cppFile, config.Name);
+                        compiler = CompilerToolWrapper.Create(defineIncludeConfig);
+                    }
+
+                    if (compiler != null && compiler.GetUsePrecompiledHeader() != pchOption.pchNone)
                         pchParameters = GetPCHMocOptions(srcMocFile, compiler);
 
                     string outputFileName = QtVSIPSettings.GetMocDirectory(envPro) + "\\";
@@ -2826,8 +2838,8 @@ namespace Digia.Qt5ProjectLib
                     }
 
                     string newCmdLine = mocCmdChecker.NewCmdLine(tool.CommandLine,
-                        GetIncludes(cppConfig),
-                        GetDefines(cppConfig),
+                        GetIncludes(defineIncludeConfig),
+                        GetDefines(defineIncludeConfig),
                         QtVSIPSettings.GetMocOptions(envPro), srcMocFile.RelativePath,
                         pchParameters,
                         outputFileName);