diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
index 2b4ceed3c4..c42c823f88 100644
--- a/Source/VSProps/QtCompile.props
+++ b/Source/VSProps/QtCompile.props
@@ -51,9 +51,14 @@
but not the include paths, as passing include paths drastically slows down
moc, and it doesn't appear to actually need them anyway.
-->
-
+
+
+
+ moc %(Identity)
+ $(QtHostToolsDir)
+ %(FullPath)
$(QtToolOutDir)moc_68\moc_%(Filename).cpp
+ $(QtToolOutDir)moc_68\
+ moc_%(Filename).cpp
+ output
+ true
+ [AllOptions] [AdditionalOptions]
+ %(OutputFile)
+ false
-
-
+
+
+
+
+ rcc %(Identity)
+ $(QtHostToolsDir)
+ %(FullPath)
+ $(QtToolOutDir)rcc\qrc_%(Filename).cpp
+ $(QtToolOutDir)rcc\
+ qrc_%(Filename).cpp
+ %(Filename)
+ default
+ false
+ output
+ true
+ [AllOptions] [AdditionalOptions]
+ %(OutputFile)
+
+
+
+
diff --git a/Source/VSProps/qtmoc.props b/Source/VSProps/qtmoc.props
deleted file mode 100644
index 18832a6e93..0000000000
--- a/Source/VSProps/qtmoc.props
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- moc %(Identity)
-
- $(QtHostToolsDir)
- $(QtInstallDir)
-
- %(FullPath)
-
- $(ProjectDir)GeneratedFiles\$(Configuration)\moc_%(Filename).cpp
-
- $(IntDir)moc\
- moc_%(Filename).cpp
-
- output
- true
- [AllOptions] [AdditionalOptions]
- %(OutputFile)
- false
-
-
-
-
-
-
-
diff --git a/Source/VSProps/QtCompile.xml b/Source/VSProps/qtmoc.xml
similarity index 100%
rename from Source/VSProps/QtCompile.xml
rename to Source/VSProps/qtmoc.xml
diff --git a/Source/VSProps/qtrcc.targets b/Source/VSProps/qtrcc.targets
new file mode 100644
index 0000000000..3b60e5848c
--- /dev/null
+++ b/Source/VSProps/qtrcc.targets
@@ -0,0 +1,580 @@
+
+
+
+
+
+
+
+
+
+
+ QtRcc;$(QtBuildTargets)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Qt;_ClCompile
+
+
+
+ QtRule40_Rcc
+
+
+
+
+
+
+
+ $([System.IO.Path]::Combine('%(QtRcc.QtRccDir)','%(QtRcc.QtRccFileName)'))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @(res_file)
+ %(QtRcc.AdditionalDependencies);@(res_file->'%(FullPath)')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [@(selected_files->'%(Identity)','][')]
+ [@(QtRcc->'%(Identity)')]
+ @(QtRcc->'%(OutputFile)')
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(input_changed)
+
+
+
+
+
+
+
+
+
+
+ QtPrepare;
+ QtRccPrepare;
+ QtRccSetModified;
+ $(QtRccDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([System.String]::Copy('%(Value)').Replace('"', ''))
+
+
+ %(Value)\
+
+
+ "%(Value)"
+
+
+
+
+
+ %(Value)
+
+
+
+
+ -o %(Value)
+
+
+
+
+
+
+
+ --temp %(Value)
+
+
+
+
+ --name %(Value)
+
+
+
+
+ --root %(Value)
+
+
+
+
+ --compress 1
+
+
+ --compress 2
+
+
+ --compress 3
+
+
+ --compress 4
+
+
+ --compress 5
+
+
+ --compress 6
+
+
+ --compress 7
+
+
+ --compress 8
+
+
+ --compress 9
+
+
+
+
+
+
+
+
+
+
+ --no-compress
+
+
+
+
+ --threshold %(Value)
+
+
+
+
+
+
+
+ --binary
+
+
+
+
+
+
+
+ --no-zstd
+
+
+
+
+ --pass %(Value)
+
+
+
+
+
+
+
+ --namespace
+
+
+
+
+
+
+
+ --verbose
+
+
+
+
+
+
+
+ --list
+
+
+
+
+
+
+
+ --project
+
+
+
+
+ --format-version %(Value)
+
+
+
+ @(options->'%(Value)', ' ')
+
+
+
+
+
+ %(QtRcc.InputChanged)
+ true
+
+
+ true
+
+
+ true
+
+
+ $([MSBuild]::MakeRelative($(ProjectDir), %(QtRcc.OutputFile)).TrimStart('\'))
+
+
+
+
+
+ rcc
+ $(QtToolsPath)/rcc
+ %(QtRcc.QTDIR)\bin\rcc.exe
+ $(options)
+ %(QtRcc.ExecutionDescription)
+ $(dependencies_changed)
+ $(input_changed)
+ true
+ false
+
+ %(QtRcc.ExecutionDescription) [pass 1]
+ 1
+ $(options)
+ $(options) -pass 1 -o "%(OutputFile)"
+ Disabled
+
+ $(output_relative)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ComputeLinkInputsTargets);
+ ;QtRccPass2_Link;
+
+
+ $(ComputeLibInputsTargets);
+ ;QtRccPass2_Lib;
+
+
+
+
+
+
+
diff --git a/Source/VSProps/qtrcc.xml b/Source/VSProps/qtrcc.xml
new file mode 100644
index 0000000000..d373d8b49e
--- /dev/null
+++ b/Source/VSProps/qtrcc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file