summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2010-08-06 11:04:01 +0200
committerhjk <qtc-committer@nokia.com>2010-08-16 10:38:28 +0200
commite441efe8d83f06b33081ff5ef734cb1db61aa4ad (patch)
treecde6ae0e02adf35dbbf14f520805f79c53ae2696
parent265d5281480b9efae5e387aff7fbb8f1c8ed267f (diff)
downloadqt-creator-e441efe8d83f06b33081ff5ef734cb1db61aa4ad.tar.gz
Fix warnings about QFileInfo being called with empty path
(cherry picked from commit e98282fcb63454aa078aa5b9afb7173788aae2ef)
-rw-r--r--src/plugins/projectexplorer/project.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp2
2 files changed, 3 insertions, 1 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();
}
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 111dea1c0c..91872791f9 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -353,7 +353,7 @@ TargetSetupPage::recursivelyCheckDirectoryForBuild(const QString &directory, con
{
QList<ImportInfo> results;
- if (maxdepth <= 0)
+ if (maxdepth <= 0 || directory.isEmpty())
return results;
// Check for in-source builds first: