summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/project.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-24 17:45:21 +0200
committerDavid Boddie <dboddie@trolltech.com>2010-08-24 17:45:21 +0200
commit8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (patch)
tree290fe9c4af570126949093affc25c7a9fb84e8ed /src/plugins/projectexplorer/project.cpp
parent1cbc4116d3c6fa1320ee4523e45a5f0df004cd3a (diff)
parente5076cc5e50be46b2f2a2307660e5e8603b780ad (diff)
downloadqt-creator-8e6569663ecbf7389b3df5d86f4ce2d1102b16c0.tar.gz
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0
Diffstat (limited to 'src/plugins/projectexplorer/project.cpp')
-rw-r--r--src/plugins/projectexplorer/project.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index bdea6c9ef2..12c47ee454 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -234,6 +234,8 @@ QString Project::projectDirectory() const
QString Project::projectDirectory(const QString &proFile)
{
+ if (proFile.isEmpty())
+ return QString();
QFileInfo info(proFile);
return info.absoluteDir().path();
}