diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /qmake/generators/win32/msvc_vcproj.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 739b5cbb3c..24421c6c28 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1346,7 +1346,6 @@ void VcprojGenerator::initDeploymentTool() if (conf.WinRT) { vcProject.DeploymentFiles.Project = this; vcProject.DeploymentFiles.Config = &(vcProject.Configuration); - vcProject.DeploymentFiles.CustomBuild = none; } } } @@ -1385,7 +1384,6 @@ void VcprojGenerator::initRootFiles() vcProject.RootFiles.Project = this; vcProject.RootFiles.Config = &(vcProject.Configuration); - vcProject.RootFiles.CustomBuild = none; } void VcprojGenerator::initSourceFiles() @@ -1398,7 +1396,6 @@ void VcprojGenerator::initSourceFiles() vcProject.SourceFiles.Project = this; vcProject.SourceFiles.Config = &(vcProject.Configuration); - vcProject.SourceFiles.CustomBuild = none; } void VcprojGenerator::initHeaderFiles() @@ -1450,7 +1447,6 @@ void VcprojGenerator::initLexYaccFiles() vcProject.LexYaccFiles.Project = this; vcProject.LexYaccFiles.Config = &(vcProject.Configuration); - vcProject.LexYaccFiles.CustomBuild = lexyacc; } void VcprojGenerator::initTranslationFiles() @@ -1464,7 +1460,6 @@ void VcprojGenerator::initTranslationFiles() vcProject.TranslationFiles.Project = this; vcProject.TranslationFiles.Config = &(vcProject.Configuration); - vcProject.TranslationFiles.CustomBuild = none; } void VcprojGenerator::initFormFiles() @@ -1476,7 +1471,6 @@ void VcprojGenerator::initFormFiles() vcProject.FormFiles.addFiles(project->values("FORMS")); vcProject.FormFiles.Project = this; vcProject.FormFiles.Config = &(vcProject.Configuration); - vcProject.FormFiles.CustomBuild = none; } void VcprojGenerator::initResourceFiles() @@ -1526,7 +1520,6 @@ void VcprojGenerator::initResourceFiles() vcProject.ResourceFiles.Project = this; vcProject.ResourceFiles.Config = &(vcProject.Configuration); - vcProject.ResourceFiles.CustomBuild = none; } void VcprojGenerator::initExtraCompilerOutputs() @@ -1603,7 +1596,6 @@ void VcprojGenerator::initExtraCompilerOutputs() } extraCompile.Project = this; extraCompile.Config = &(vcProject.Configuration); - extraCompile.CustomBuild = none; vcProject.ExtraCompilersFiles.append(extraCompile); } |