diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-12-02 11:20:43 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-12-02 12:27:10 +0100 |
| commit | 98d130fc46ef5ff7c3d1138a4a9949a1c2594c47 (patch) | |
| tree | bef674d4a43067ae9b196327feeb00cbb854eff5 /qmake | |
| parent | 69d36948314e2f3a83931a11de96df3d28d91524 (diff) | |
fix rc compilation in vcxproj files
We don't need to modify ResourceOutputFileName. The default is fine,
and $(InputName) evaluates to nothing in VS >= 2010.
Change-Id: Ib203d36261e1b5449c5a139b1950bd0d66197297
Task-number: QTBUG-43026
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 9385a50e02..f271eb0679 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1177,7 +1177,7 @@ void VcprojGenerator::initResourceTool() // to add it for the compiler) However, the resource tool does not do this. if(project->isActiveConfig("debug")) conf.resource.PreprocessorDefinitions += "_DEBUG"; - if(project->isActiveConfig("staticlib")) + if (conf.CompilerVersion < NET2010 && project->isActiveConfig("staticlib")) conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res"; } |