diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-01 01:00:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-01 01:00:54 +0100 |
| commit | 7aa204d5b30d3d55ac838b4df601feaa368412b8 (patch) | |
| tree | ecc155d46985f1143845d3bd13074914149f22f3 /qmake/generators/win32/msvc_vcproj.h | |
| parent | c47ec42f02196f387c28ab1a5ac70a23ec642a63 (diff) | |
| parent | 55b464196297afc11cb9836f61f737e6fdaf04dc (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icec0aa703d8a13efa9f1634a1a353eb9d63685c8
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 6f9743cb09..55d36c3762 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -132,6 +132,7 @@ private: ProString firstInputFileName(const ProString &extraCompilerName) const; QString firstExpandedOutputFileName(const ProString &extraCompilerName); void createCustomBuildToolFakeFile(const QString &cbtFilePath, const QString &realOutFilePath); + bool otherFiltersContain(const QString &fileName) const; friend class VCFilter; }; |