Update project wizards to V3 format

This change updates wizards to generate project files in the V3 format.

Change-Id: If2bf38a2bfc54a6c14a1e1e80864cad5124325d2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

15 files changed, 26 insertions, 40 deletions

diff --git a/src/qttemplates/console/console.vcxproj b/src/qttemplates/console/console.vcxproj
index fec8ba5d..8bcecf63 100644
--- a/src/qttemplates/console/console.vcxproj
+++ b/src/qttemplates/console/console.vcxproj
@@ -39,6 +39,10 @@
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
+  </PropertyGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|$Platform$'">
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
diff --git a/src/qttemplates/console/console.vcxproj.filters b/src/qttemplates/console/console.vcxproj.filters
index 34adaf5f..421006ab 100644
--- a/src/qttemplates/console/console.vcxproj.filters
+++ b/src/qttemplates/console/console.vcxproj.filters
@@ -18,11 +18,6 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
diff --git a/src/qttemplates/designer/designer.vcxproj b/src/qttemplates/designer/designer.vcxproj
index 0910395d..1222753b 100644
--- a/src/qttemplates/designer/designer.vcxproj
+++ b/src/qttemplates/designer/designer.vcxproj
@@ -39,6 +39,10 @@
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
+  </PropertyGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|$Platform$'">
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
diff --git a/src/qttemplates/designer/designer.vcxproj.filters b/src/qttemplates/designer/designer.vcxproj.filters
index 6f8b2f5d..33eb1738 100644
--- a/src/qttemplates/designer/designer.vcxproj.filters
+++ b/src/qttemplates/designer/designer.vcxproj.filters
@@ -18,10 +18,5 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
   </ItemGroup>
 </Project>
diff --git a/src/qttemplates/gui/gui.vcxproj b/src/qttemplates/gui/gui.vcxproj
index 493258ca..2d7b33ae 100644
--- a/src/qttemplates/gui/gui.vcxproj
+++ b/src/qttemplates/gui/gui.vcxproj
@@ -55,6 +55,10 @@
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
+  </PropertyGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|$Platform$'">
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
diff --git a/src/qttemplates/gui/gui.vcxproj.filters b/src/qttemplates/gui/gui.vcxproj.filters
index a1af2ecf..ff119fc9 100644
--- a/src/qttemplates/gui/gui.vcxproj.filters
+++ b/src/qttemplates/gui/gui.vcxproj.filters
@@ -22,11 +22,6 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
diff --git a/src/qttemplates/lib/lib.vcxproj b/src/qttemplates/lib/lib.vcxproj
index 1b1a5889..bc68259e 100644
--- a/src/qttemplates/lib/lib.vcxproj
+++ b/src/qttemplates/lib/lib.vcxproj
@@ -39,6 +39,10 @@
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
+  </PropertyGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|$Platform$'">
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
diff --git a/src/qttemplates/lib/lib.vcxproj.filters b/src/qttemplates/lib/lib.vcxproj.filters
index be1ba8a5..7c9f93ac 100644
--- a/src/qttemplates/lib/lib.vcxproj.filters
+++ b/src/qttemplates/lib/lib.vcxproj.filters
@@ -18,11 +18,6 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$sourcefilename$">
diff --git a/src/qttemplates/server/server.vcxproj b/src/qttemplates/server/server.vcxproj
index 1cf57014..268d6c80 100644
--- a/src/qttemplates/server/server.vcxproj
+++ b/src/qttemplates/server/server.vcxproj
@@ -39,6 +39,10 @@
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
     <Import Project="$(QtMsBuild)\qt.props" />
   </ImportGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
+  </PropertyGroup>
+  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|$Platform$'">
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|$Platform$'">
diff --git a/src/qttemplates/server/server.vcxproj.filters b/src/qttemplates/server/server.vcxproj.filters
index 90a31f1c..7a7709fd 100644
--- a/src/qttemplates/server/server.vcxproj.filters
+++ b/src/qttemplates/server/server.vcxproj.filters
@@ -22,10 +22,5 @@
       <Extensions>qrc;*</Extensions>
       <ParseFiles>false</ParseFiles>
     </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
   </ItemGroup>
 </Project>
diff --git a/src/qtwizard/ConsoleWizard.cs b/src/qtwizard/ConsoleWizard.cs
index 0e980092..81f7b8f0 100644
--- a/src/qtwizard/ConsoleWizard.cs
+++ b/src/qtwizard/ConsoleWizard.cs
@@ -157,7 +157,7 @@ namespace QtProjectWizard
                 qtProject.SelectSolutionPlatform(vi.GetVSPlatformName());
             vm.SaveProjectQtVersion(project, qtVersion);
 
-            qtProject.MarkAsQtProject("v1.0");
+            qtProject.MarkAsQtProject();
             qtProject.AddDirectories();
 
             var type = TemplateType.Application | TemplateType.ConsoleSystem;
diff --git a/src/qtwizard/DesignerWizard.cs b/src/qtwizard/DesignerWizard.cs
index ae3b55cc..4adcbd52 100644
--- a/src/qtwizard/DesignerWizard.cs
+++ b/src/qtwizard/DesignerWizard.cs
@@ -69,7 +69,7 @@ namespace QtProjectWizard
                 qtProject.SelectSolutionPlatform(vi.GetVSPlatformName());
             vm.SaveProjectQtVersion(project, qtVersion);
 
-            qtProject.MarkAsQtProject("v1.0");
+            qtProject.MarkAsQtProject();
             qtProject.AddDirectories();
 
             var type = TemplateType.PluginProject | TemplateType.DynamicLibrary | TemplateType.GUISystem;
diff --git a/src/qtwizard/GuiWizard.cs b/src/qtwizard/GuiWizard.cs
index 0c015de3..71f52b75 100644
--- a/src/qtwizard/GuiWizard.cs
+++ b/src/qtwizard/GuiWizard.cs
@@ -235,23 +235,14 @@ namespace QtProjectWizard
         {
             var qtProject = QtProject.Create(project);
 
-            QtVSIPSettings.SaveUicDirectory(project, null);
-            QtVSIPSettings.SaveMocDirectory(project, null);
-            QtVSIPSettings.SaveMocOptions(project, null);
-            QtVSIPSettings.SaveRccDirectory(project, null);
-            QtVSIPSettings.SaveLUpdateOnBuild(project);
-            QtVSIPSettings.SaveLUpdateOptions(project, null);
-            QtVSIPSettings.SaveLReleaseOptions(project, null);
-
             var vm = QtVersionManager.The();
             var qtVersion = vm.GetDefaultVersion();
             var vi = VersionInformation.Get(vm.GetInstallPath(qtVersion));
             if (vi.GetVSPlatformName() != "Win32")
                 qtProject.SelectSolutionPlatform(vi.GetVSPlatformName());
-            vm.SaveProjectQtVersion(project, qtVersion);
-
-            qtProject.MarkAsQtProject("v1.0");
+            qtProject.MarkAsQtProject();
             qtProject.AddDirectories();
+            vm.SaveProjectQtVersion(project, qtVersion);
 
             var type = TemplateType.Application | TemplateType.GUISystem;
             qtProject.WriteProjectBasicConfigurations(type, data.UsePrecompiledHeader);
diff --git a/src/qtwizard/LibraryWizard.cs b/src/qtwizard/LibraryWizard.cs
index 27304917..d14822a8 100644
--- a/src/qtwizard/LibraryWizard.cs
+++ b/src/qtwizard/LibraryWizard.cs
@@ -67,7 +67,7 @@ namespace QtProjectWizard
                 qtProject.SelectSolutionPlatform(vi.GetVSPlatformName());
             vm.SaveProjectQtVersion(project, qtVersion);
 
-            qtProject.MarkAsQtProject("v1.0");
+            qtProject.MarkAsQtProject();
             qtProject.AddDirectories();
 
             var type = TemplateType.GUISystem | (data.CreateStaticLibrary
diff --git a/src/qtwizard/ServerWizard.cs b/src/qtwizard/ServerWizard.cs
index e1c401bb..cb0897c7 100644
--- a/src/qtwizard/ServerWizard.cs
+++ b/src/qtwizard/ServerWizard.cs
@@ -68,7 +68,7 @@ namespace QtProjectWizard
                 qtProject.SelectSolutionPlatform(vi.GetVSPlatformName());
             vm.SaveProjectQtVersion(project, qtVersion);
 
-            qtProject.MarkAsQtProject("v1.0");
+            qtProject.MarkAsQtProject();
             qtProject.AddDirectories();
 
             var type = TemplateType.DynamicLibrary | TemplateType.GUISystem;