diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:12:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:19:27 +0200 |
| commit | 9967a011eaae8988b10e56fde0f2ab8b6bab90ac (patch) | |
| tree | 353b932414a8d9d94a418e84068550b0a2376b37 /qmake/generators/win32/msvc_vcproj.h | |
| parent | 91ab70d17f892f3ff6b2019632fda3920d045dcb (diff) | |
| parent | 99636127d10f96d8313bc26030cabf9841381914 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
qmake/generators/makefile.cpp
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoaintegration.mm
Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 55d36c3762..8f38252274 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -74,6 +74,8 @@ protected: bool doDepends() const override { return false; } // Never necessary using Win32MakefileGenerator::replaceExtraCompilerVariables; QString replaceExtraCompilerVariables(const QString &, const QStringList &, const QStringList &, ReplaceFor) override; + QString extraCompilerName(const ProString &extraCompiler, const QStringList &inputs, + const QStringList &outputs); bool supportsMetaBuild() override { return true; } bool supportsMergedBuilds() override { return true; } bool mergeBuildProject(MakefileGenerator *other) override; |