diff options
| author | dt <qtc-committer@nokia.com> | 2010-07-27 12:34:24 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-08-17 12:29:46 +0200 |
| commit | 46b414f5a817f30033656dc1c4107a0e0054ec6d (patch) | |
| tree | e8e95a00a0e6e2549026c1f04f8c4cf1217e98d7 | |
| parent | 294dfd10a3c2f8444e3c665a7d2ce388fbba500f (diff) | |
| download | qt-creator-46b414f5a817f30033656dc1c4107a0e0054ec6d.tar.gz | |
Fix DESTDIR=. case
Qmake treats "." special, we need to do the same
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index fd34df2e73..7d3f74054b 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1489,7 +1489,7 @@ TargetInformation Qt4ProFileNode::targetInformation(ProFileReader *reader) const result.workingDir = QDir::cleanPath(result.workingDir); QString wd = result.workingDir; - if (!reader->contains("DESTDIR") + if ( (!reader->contains("DESTDIR") || reader->value("DESTDIR") == ".") && reader->values("CONFIG").contains("debug_and_release") && reader->values("CONFIG").contains("debug_and_release_target")) { // If we don't have a destdir and debug and release is set |