diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-05 18:49:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 18:49:33 -0700 |
| commit | 59bf761f87cccb2afa36897c2aee4dd26901b11e (patch) | |
| tree | dc7b8eae3daba98be8e0149a1030a5d37178d8d9 | |
| parent | d51be949a936dd7f93159afca77b8cbd1b758fc5 (diff) | |
| parent | 0db59c71f60233bd94687e8245dbf5f81b9f51f9 (diff) | |
Merge pull request #5551 from shuffle2/msbuild-qt-tidy
msbuild/qt: remove .qrc and .ui file support
| -rw-r--r-- | Source/VSProps/QtCompile.props | 44 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.targets | 2 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.xml | 6 |
3 files changed, 1 insertions, 51 deletions
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index 5ad513e374..ac6c57a73f 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -37,44 +37,6 @@ </Link> </ItemDefinitionGroup> - <!--Passes all .qrc files to rcc and puts output in the build directory--> - <ItemGroup> - <ResFiles Include="$(MSBuildProjectDirectory)\**\*.qrc" /> - </ItemGroup> - <Target Name="QtResource" - BeforeTargets="ClCompile" - Inputs="@(ResFiles)" - Condition="'@(QtResource)'!=''" - Outputs="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')"> - <Message Text="rcc %(ResFiles.Filename)" Importance="High" /> - <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" /> - <MakeDir Directories="$(QtToolOutDir)" /> - <Exec Command=""$(QtBinDir)rcc.exe" "%(ResFiles.FullPath)" -o "$(QtToolOutDir)qrc_%(ResFiles.Filename).h"" /> - </Target> - - <Target Name="QtResourceClean"> - <Delete Files="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')" /> - </Target> - - <!--Passes all .ui files to uic and puts output in the build directory--> - <ItemGroup> - <UiFiles Include="$(MSBuildProjectDirectory)\**\*.ui" /> - </ItemGroup> - <Target Name="QtUi" - BeforeTargets="ClCompile" - Inputs="@(UiFiles)" - Condition="'@(QtUi)'!=''" - Outputs="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')"> - <Message Text="uic %(UiFiles.Filename)" Importance="High" /> - <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" /> - <MakeDir Directories="$(QtToolOutDir)" /> - <Exec Command=""$(QtBinDir)uic.exe" "%(UiFiles.FullPath)" -o "$(QtToolOutDir)ui_%(UiFiles.Filename).h"" /> - </Target> - - <Target Name="QtUiClean"> - <Delete Files="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')" /> - </Target> - <!--Compile files needed to MOC and output in the build directory--> <!--TODO find a way to autocreate from ClCompile settings--> <PropertyGroup> @@ -112,12 +74,6 @@ <!--Expose the new targets to VS--> <ItemGroup> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" /> - <AvailableItemName Include="QtResource"> - <Targets>QtResource</Targets> - </AvailableItemName> - <AvailableItemName Include="QtUi"> - <Targets>QtUi</Targets> - </AvailableItemName> <AvailableItemName Include="QtMoc"> <Targets>QtMoc</Targets> </AvailableItemName> diff --git a/Source/VSProps/QtCompile.targets b/Source/VSProps/QtCompile.targets index 9ab1522a8d..bd437e7c34 100644 --- a/Source/VSProps/QtCompile.targets +++ b/Source/VSProps/QtCompile.targets @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <CleanDependsOn>QtResourceClean;QtUiClean;QtMocClean;$(CleanDependsOn)</CleanDependsOn> + <CleanDependsOn>QtMocClean;$(CleanDependsOn)</CleanDependsOn> <!-- <ComputeLinkInputsTargets>$(ComputeLinkInputsTargets);QtComputeMocOutput;</ComputeLinkInputsTargets> <ComputeLibInputsTargets>$(ComputeLibInputsTargets);QtComputeMocOutput;</ComputeLibInputsTargets> diff --git a/Source/VSProps/QtCompile.xml b/Source/VSProps/QtCompile.xml index 976c2d2b82..200771e114 100644 --- a/Source/VSProps/QtCompile.xml +++ b/Source/VSProps/QtCompile.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties"> - <ItemType Name="QtResource" DisplayName="Qt Resource File" /> - <ItemType Name="QtUi" DisplayName="Qt User Interface File" /> <ItemType Name="QtMoc" DisplayName="Qt Meta Object File" /> - <ContentType Name="QtUi" DisplayName="Qt User Interface Compiler" /> - <ContentType Name="QtResource" DisplayName="Qt Resource Compiler" /> <ContentType Name="QtMoc" DisplayName="Qt Meta Object Compiler" /> - <FileExtension Name="*.qrc" ContentType="QtResource" /> - <FileExtension Name="*.ui" ContentType="QtUi" /> </ProjectSchemaDefinitions>
\ No newline at end of file |