From d7284b620ac0c1c2ecce6a918aa1c427f48ae496 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 21 Feb 2012 13:42:35 +0100
Subject: [PATCH] Fix importing in source build with no qt version
Before we would only offer widgets for targets which had at least
a qt version. Thus it was impossible to import a in source desktop
build if the user had no qt version for the desktop in the settings.
Change-Id: Ib8e04b1569ac3499c11c5cfda6c708f5fd408144
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
.../qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp | 2 +-
src/plugins/qt4projectmanager/qt4target.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
index d2e4c6e59a7..6c1d29d45e1 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
@@ -134,7 +134,7 @@ Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QSt
minimumQtVersion,
maximumQtVersion,
requiredFeatures);
- if (infos.isEmpty())
+ if (infos.isEmpty() && importInfos.isEmpty())
return 0;
Qt4DefaultTargetSetupWidget *widget = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos,
minimumQtVersion, maximumQtVersion,
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 5f98f5a4715..8c7c7e50199 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -102,7 +102,7 @@ Qt4TargetSetupWidget *Qt4BaseTargetFactory::createTargetSetupWidget(const QStrin
minimumQtVersion,
maximumQtVersion,
requiredFeatures);
- if (infos.isEmpty())
+ if (infos.isEmpty() && importInfos.isEmpty())
return 0;
const bool supportsShadowBuilds
= targetFeatures(id).contains(QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID));
--
GitLab