From 0146be396d66c3a796722f8838c59e291ae97c55 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Wed, 15 May 2013 13:37:49 +0200
Subject: [PATCH] Qbs: Prevent some warnings on the console
Make sure the different paths are not empty to avoid warnings about
them being so.
Change-Id: I9ac08bb30a87e1b77c2b98c58c502eb41be36c1b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index 7b31b1feb37..c7cafcfca0c 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -136,7 +136,7 @@ QString QbsInstallStep::absoluteInstallRoot() const
{
const qbs::ProjectData *data = static_cast<QbsProject *>(project())->qbsProjectData();
QString path = installRoot();
- if (data)
+ if (data && !data->buildDirectory().isEmpty() && !path.isEmpty())
path = QDir(data->buildDirectory()).absoluteFilePath(path);
return path;
}
--
GitLab