diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-31 13:53:24 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-08-09 10:29:28 +0200 |
commit | e75aed1a96e626f079af307c5604ddf9054ecafc (patch) | |
tree | a39e42082e91f3b6f356299228cacea0e96e3a1e /qmake/generators/win32 | |
parent | 38cfd3a8cbc93001e7e9707640694aba275a370b (diff) |
Warn about conflicting DESTDIR/TARGET combination in debug_and_release
If a project has DESTDIR and TARGET set to fixed values, then the
target paths conflict when doing debug_and_release builds.
With this change we're detecting this situation and yield a warning.
Fixes: QTBUG-2736
Change-Id: Ib163db3463322792ab9fa5b997285ac9fc9819ab
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'qmake/generators/win32')
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 5 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index b79fd8f250..613a5a6a89 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -815,4 +815,9 @@ QString Win32MakefileGenerator::getManifestFileForRcFile() const return QString(); } +ProKey Win32MakefileGenerator::fullTargetVariable() const +{ + return "DEST_TARGET"; +} + QT_END_NAMESPACE diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index 8eb633fdfa..09984fe355 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h @@ -64,6 +64,9 @@ protected: void processRcFileVar(); static QString cQuoted(const QString &str); virtual QString getManifestFileForRcFile() const; + +public: + ProKey fullTargetVariable() const override; }; QT_END_NAMESPACE |