diff options
author | dt <qtc-committer@nokia.com> | 2010-04-13 12:27:01 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-04-13 17:22:15 +0200 |
commit | 70a45da6c2f5c8481d82fff1dcabd5d18370d3b9 (patch) | |
tree | c1f1dbf68ee301b05beb852403f6f19358d7ca81 | |
parent | 23b9251bc8ac02c862e55a180148474d49475d73 (diff) |
Work around to deep build directory.
Reviewed-By: hunger
Task-Nr: QTCREATORBUG-1036
(cherry picked from commit 0bd06f106467bb3ca551e319fe0db106902d5502)
-rw-r--r-- | src/plugins/qt4projectmanager/qt4target.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index 900502b5389..37a4bd8afb4 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -368,7 +368,11 @@ QString Qt4Target::defaultBuildDirectory() const else if (id() == QLatin1String(Constants::MAEMO_DEVICE_TARGET_ID)) shortName = QLatin1String("maemo"); - return qt4Project()->defaultTopLevelBuildDirectory() + QChar('/') + shortName; + // currently we can't have the build directory to be deeper then the source directory + // since that is broken in qmake + // Once qmake is fixed we can change that to have a top directory and + // subdirectories per build. (Replacing "QChar('-')" with "QChar('/') ) + return qt4Project()->defaultTopLevelBuildDirectory() + QChar('-') + shortName; } bool Qt4Target::fromMap(const QVariantMap &map) |