Merge branch 'v1.2'

MountCloud · Nov 17, 2021 · f91c1ed · f91c1ed
2 parents e1fe817 + f97ef9a
commit f91c1ed
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/FireDogEditor/FireDogEditor.vcxproj b/FireDogEditor/FireDogEditor.vcxproj
@@ -120,6 +120,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bigdatatableitem.h" />
+    <ClInclude Include="resource.h" />
     <QtMoc Include="Qss\Qss.h" />
     <QtMoc Include="FireDogFeatureInfo.h" />
     <QtMoc Include="FireDogFeatureRuleInfo.h" />
@@ -130,12 +131,18 @@
     <ClInclude Include="gui18n.h" />
     <ClInclude Include="gui18nutil.h" />
     <ClInclude Include="partutil.h" />
-    <ClInclude Include="resource.h" />
     <QtMoc Include="bigdatatablemodel.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Qss\css\qss.css" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FireDogEditorResource.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon1.ico" />
+    <Image Include="resources\icon.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

diff --git a/FireDogEditor/FireDogEditor.vcxproj.filters b/FireDogEditor/FireDogEditor.vcxproj.filters
@@ -161,9 +161,6 @@
     <ClInclude Include="bigdatatableitem.h">
       <Filter>Header Files\components</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="partutil.h">
       <Filter>Header Files\part</Filter>
     </ClInclude>
@@ -173,6 +170,9 @@
     <ClInclude Include="gui18nutil.h">
       <Filter>Header Files\i18n</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtUic Include="FireDogFeatureInfo.ui">
@@ -193,4 +193,17 @@
       <Filter>Source Files\qss\css</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FireDogEditorResource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon1.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="resources\icon.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
 </Project>