forked from qt-creator/qt-creator
Qt4ProjectManager: New TargetSetupPage
Rewrite the target setup page to look and baheve better. Noteable better at: - Disabling shadow building - Deselecting whole targets - Adding import directories Api-wise, Targets derived from Qt4BaseTarget have two ways to customize the targetsetuppage. a) Reimplement availableBuildConfigurations b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget) in their default implementation. (Or only slightly customize like the desktop target does.) Or: a) Make a dummy implementation for availableBuildConfiguration b) Replace createTargetSetupWidget and return your own widget (It should match the look and feel from the other widgets.) It needs to be derived from Qt4TargetSetupWidget c) Also replace the create create(... Qt4TargetSetupWidget) function and set up the target anyway you want.
This commit is contained in:
@@ -44,8 +44,6 @@
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
#include <projectexplorer/customexecutablerunconfiguration.h>
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
|
||||
using namespace Qt4ProjectManager;
|
||||
using namespace Qt4ProjectManager::Internal;
|
||||
using ProjectExplorer::idFromMap;
|
||||
@@ -72,7 +70,7 @@ bool Qt4MaemoTargetFactory::supportsTargetId(const QString &id) const
|
||||
QStringList Qt4MaemoTargetFactory::supportedTargetIds(ProjectExplorer::Project *parent) const
|
||||
{
|
||||
QStringList targetIds;
|
||||
if (!qobject_cast<Qt4Project *>(parent))
|
||||
if (parent && !qobject_cast<Qt4Project *>(parent))
|
||||
return targetIds;
|
||||
if (QtVersionManager::instance()->supportsTargetId(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)))
|
||||
targetIds << QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID);
|
||||
@@ -151,19 +149,10 @@ QString Qt4MaemoTargetFactory::defaultShadowBuildDirectory(const QString &projec
|
||||
return projectLocation + QLatin1Char('-') + suffix;
|
||||
}
|
||||
|
||||
QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfigurations(const QString &proFilePath)
|
||||
{
|
||||
return QList<BuildConfigurationInfo>()
|
||||
<< availableBuildConfigurations(proFilePath, QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
|
||||
<< availableBuildConfigurations(proFilePath, QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
|
||||
<< availableBuildConfigurations(proFilePath, QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID));
|
||||
}
|
||||
|
||||
QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfigurations(const QString &proFilePath,
|
||||
const QString &id)
|
||||
QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfigurations(const QString &id, const QString &proFilePath, const QtVersionNumber &minimumQtVersion)
|
||||
{
|
||||
QList<BuildConfigurationInfo> infos;
|
||||
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id);
|
||||
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id, minimumQtVersion);
|
||||
|
||||
foreach (QtVersion *version, knownVersions) {
|
||||
if (!version->isValid())
|
||||
@@ -176,6 +165,12 @@ QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfiguration
|
||||
return infos;
|
||||
}
|
||||
|
||||
bool Qt4MaemoTargetFactory::isMobileTarget(const QString &id)
|
||||
{
|
||||
Q_UNUSED(id)
|
||||
return true;
|
||||
}
|
||||
|
||||
Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
|
||||
{
|
||||
if (!canCreate(parent, id))
|
||||
@@ -196,7 +191,7 @@ Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, c
|
||||
}
|
||||
|
||||
Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent,
|
||||
const QString &id, QList<BuildConfigurationInfo> infos)
|
||||
const QString &id, const QList<BuildConfigurationInfo> &infos)
|
||||
{
|
||||
if (!canCreate(parent, id))
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user