From e441efe8d83f06b33081ff5ef734cb1db61aa4ad Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 6 Aug 2010 11:04:01 +0200
Subject: [PATCH] Fix warnings about QFileInfo being called with empty path
(cherry picked from commit e98282fcb63454aa078aa5b9afb7173788aae2ef)
---
src/plugins/projectexplorer/project.cpp | 2 ++
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index bdea6c9ef2b..12c47ee454b 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 111dea1c0c4..91872791f90 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:
--
GitLab