From bddf21c553723026718ffdadf4df8a58af198609 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 19 Feb 2010 11:06:25 +0100
Subject: [PATCH] qWarning when failing to create default target settings
---
src/plugins/qt4projectmanager/projectloadwizard.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 544b20af78e..18ede840862 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -130,6 +130,8 @@ void ProjectLoadWizard::done(int result)
continue;
m_project->addTarget(t);
}
+ if (m_project->targets().isEmpty())
+ qWarning() << "Failed to populate project with default targets for imported Qt" << m_importVersion->displayName();
} else {
// Not importing
if (m_temporaryVersion)
@@ -138,13 +140,13 @@ void ProjectLoadWizard::done(int result)
// Find a Qt version:
QList<QtVersion *> candidates = vm->versions();
QtVersion *defaultVersion = candidates.at(0); // always there and always valid!
+ // Check for the first valid desktop-Qt, fall back to any valid Qt if no desktop
+ // flavour is available.
foreach (QtVersion *v, candidates) {
if (v->isValid())
defaultVersion = v;
- if (v->supportsTargetId(DESKTOP_TARGET_ID) && v->isValid()) {
- defaultVersion = v;
+ if (v->supportsTargetId(DESKTOP_TARGET_ID) && v->isValid())
break;
- }
}
foreach (const QString &id, defaultVersion->supportedTargetIds()) {
@@ -153,6 +155,8 @@ void ProjectLoadWizard::done(int result)
continue;
m_project->addTarget(t);
}
+ if (m_project->targets().isEmpty())
+ qWarning() << "Failed to populate project with default targets for default Qt" << m_importVersion->displayName();
}
}
--
GitLab