Fixed VC project options conflicts.
git-svn-id: http://yate.null.ro/svn/yate/trunk@5616 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
55c7a8e843
commit
df080024ae
|
@ -60,7 +60,7 @@
|
|||
ProgramDataBaseFileName=".\Debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
|
@ -295,18 +295,6 @@
|
|||
<Filter
|
||||
Name="Generated Files"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\Debug\moc_qt4client.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Release\moc_qt4client.cpp"
|
||||
>
|
||||
|
@ -330,6 +318,18 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Debug\moc_qt4client.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
|
Loading…
Reference in New Issue