ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3034 from waddlesplash/new-qt 

QtCompile.props: Update for Qt 5.5.
This commit is contained in:
Matthew Parlane 2015-09-28 15:17:17 +13:00
parent ce493b897d c781123db7
commit ba96ca289d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/VSProps/QtCompile.props
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<QTDIRDefault>$(ExternalsDir)Qt\Qt5.4.0\5.4\msvc2013_64_opengl\</QTDIRDefault> <QTDIRDefault>$(ExternalsDir)Qt\Qt5.5.0\5.5\msvc2015_64_opengl\</QTDIRDefault>
<QTDIR Condition="Exists('$(QTDIRDefault)') And '$(QTDIR)'==''">$(QTDIRDefault)</QTDIR> <QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR>
<QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR> <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR>
<QtDirValid>false</QtDirValid> <QtDirValid>false</QtDirValid>
<QtDirValid Condition="Exists('$(QTDIR)')">true</QtDirValid> <QtDirValid Condition="Exists('$(QTDIR)')">true</QtDirValid>
@ -36,7 +36,7 @@
--> -->
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!--Passes all .qrc files to rcc and puts output in the build directory--> <!--Passes all .qrc files to rcc and puts output in the build directory-->
<ItemGroup> <ItemGroup>
<ResFiles Include="$(MSBuildProjectDirectory)\**\*.qrc" /> <ResFiles Include="$(MSBuildProjectDirectory)\**\*.qrc" />
@ -51,11 +51,11 @@
<MakeDir Directories="$(QtToolOutDir)" /> <MakeDir Directories="$(QtToolOutDir)" />
<Exec Command="&quot;$(QtBinDir)rcc.exe&quot; &quot;%(ResFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)qrc_%(ResFiles.Filename).h&quot;" /> <Exec Command="&quot;$(QtBinDir)rcc.exe&quot; &quot;%(ResFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)qrc_%(ResFiles.Filename).h&quot;" />
</Target> </Target>
<Target Name="QtResourceClean"> <Target Name="QtResourceClean">
<Delete Files="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')" /> <Delete Files="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')" />
</Target> </Target>
<!--Passes all .ui files to uic and puts output in the build directory--> <!--Passes all .ui files to uic and puts output in the build directory-->
<ItemGroup> <ItemGroup>
<UiFiles Include="$(MSBuildProjectDirectory)\**\*.ui" /> <UiFiles Include="$(MSBuildProjectDirectory)\**\*.ui" />
@ -70,11 +70,11 @@
<MakeDir Directories="$(QtToolOutDir)" /> <MakeDir Directories="$(QtToolOutDir)" />
<Exec Command="&quot;$(QtBinDir)uic.exe&quot; &quot;%(UiFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)ui_%(UiFiles.Filename).h&quot;" /> <Exec Command="&quot;$(QtBinDir)uic.exe&quot; &quot;%(UiFiles.FullPath)&quot; -o &quot;$(QtToolOutDir)ui_%(UiFiles.Filename).h&quot;" />
</Target> </Target>
<Target Name="QtUiClean"> <Target Name="QtUiClean">
<Delete Files="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')" /> <Delete Files="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')" />
</Target> </Target>
<!--Compile files needed to MOC and output in the build directory--> <!--Compile files needed to MOC and output in the build directory-->
<!--TODO find a way to autocreate from ClCompile settings--> <!--TODO find a way to autocreate from ClCompile settings-->
<PropertyGroup> <PropertyGroup>
@ -101,14 +101,14 @@
<MakeDir Directories="$(QtToolOutDir)" /> <MakeDir Directories="$(QtToolOutDir)" />
<Exec Command="&quot;$(QtBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -o &quot;$(QtToolOutDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" /> <Exec Command="&quot;$(QtBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -o &quot;$(QtToolOutDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" />
</Target> </Target>
<ItemGroup> <ItemGroup>
<MocOutputs Include="$(QtToolOutDir)moc_*.cpp" /> <MocOutputs Include="$(QtToolOutDir)moc_*.cpp" />
</ItemGroup> </ItemGroup>
<Target Name="QtMocClean"> <Target Name="QtMocClean">
<Delete Files="@(MocOutputs)" /> <Delete Files="@(MocOutputs)" />
</Target> </Target>
<!--Expose the new targets to VS--> <!--Expose the new targets to VS-->
<ItemGroup> <ItemGroup>
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
@ -122,11 +122,10 @@
<Targets>QtMoc</Targets> <Targets>QtMoc</Targets>
</AvailableItemName> </AvailableItemName>
</ItemGroup> </ItemGroup>
<!--Copy the needed dlls--> <!--Copy the needed dlls-->
<ItemGroup> <ItemGroup>
<IcuDlls Include="icudt53;icuin53;icuuc53" /> <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" />
<QtLibNames Include="@(IcuDlls);Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" />
<QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" /> <QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" />
<!--Filter plugins to copy based on the observation that all debug versions end in "d"--> <!--Filter plugins to copy based on the observation that all debug versions end in "d"-->
<QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" /> <QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" />