catch exceptions in wrapper getters (reflection versions)

Importing Qt 4.7 src/gui/gui.pro triggered an exception in
CompilerToolWrapper.GetStringProperty.

2 files changed, 23 insertions, 7 deletions

diff --git a/Qt4VS2003/QtProjectLib/CompilerToolWrapper.cs b/Qt4VS2003/QtProjectLib/CompilerToolWrapper.cs
index 97a5bfab..8004ea50 100644
--- a/Qt4VS2003/QtProjectLib/CompilerToolWrapper.cs
+++ b/Qt4VS2003/QtProjectLib/CompilerToolWrapper.cs
@@ -480,7 +480,15 @@ namespace Nokia.QtProjectLib
 
         private string GetStringProperty(string name)
         {
-            object obj = compilerType.InvokeMember(name, System.Reflection.BindingFlags.GetProperty, null, compilerObj, null);
+            object obj;
+            try
+            {
+                obj = compilerType.InvokeMember(name, System.Reflection.BindingFlags.GetProperty, null, compilerObj, null);
+            }
+            catch
+            {
+                obj = null;
+            }
             if (obj == null)
                 return "";
             else
diff --git a/Qt4VS2003/QtProjectLib/DeploymentToolWrapper.cs b/Qt4VS2003/QtProjectLib/DeploymentToolWrapper.cs
index f303cba6..bc975cb2 100644
--- a/Qt4VS2003/QtProjectLib/DeploymentToolWrapper.cs
+++ b/Qt4VS2003/QtProjectLib/DeploymentToolWrapper.cs
@@ -120,12 +120,20 @@ namespace Nokia.QtProjectLib
 
         public string GetAdditionalFiles()
         {
-            object obj = deploymentToolType.InvokeMember(
-                "AdditionalFiles",
-                System.Reflection.BindingFlags.GetProperty,
-                null,
-                deploymentToolObj,
-                null);
+            object obj;
+            try
+            {
+                obj = deploymentToolType.InvokeMember(
+                    "AdditionalFiles",
+                    System.Reflection.BindingFlags.GetProperty,
+                    null,
+                    deploymentToolObj,
+                    null);
+            }
+            catch
+            {
+                obj = null;
+            }
 
             if (obj != null)
                 return (string)obj;