diff options
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index a28ddd63c4..c10ed3aacd 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -960,6 +960,7 @@ void VcprojGenerator::initConfiguration() // - Do this first since main configuration elements may need // - to know of certain compiler/linker options VCConfiguration &conf = vcProject.Configuration; + conf.suppressUnknownOptionWarnings = project->isActiveConfig("suppress_vcproj_warnings"); conf.CompilerVersion = which_dotnet_version(project->first("MSVC_VER").toLatin1()); initCompilerTool(); @@ -1480,10 +1481,7 @@ void VcprojGenerator::initFormFiles() vcProject.FormFiles.ParseFiles = _False; vcProject.FormFiles.Filter = "ui"; vcProject.FormFiles.Guid = _GUIDFormFiles; - vcProject.FormFiles.addFiles(project->values("FORMS")); - vcProject.FormFiles.addFiles(project->values("FORMS3")); - vcProject.FormFiles.Project = this; vcProject.FormFiles.Config = &(vcProject.Configuration); vcProject.FormFiles.CustomBuild = none; @@ -1543,7 +1541,6 @@ void VcprojGenerator::initExtraCompilerOutputs() { ProStringList otherFilters; otherFilters << "FORMS" - << "FORMS3" << "GENERATED_FILES" << "GENERATED_SOURCES" << "HEADERS" |