summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/android/android.pro6
-rw-r--r--src/plugins/android/androidplugin.cpp2
-rw-r--r--src/plugins/android/androidpotentialkit.cpp121
-rw-r--r--src/plugins/android/androidpotentialkit.h61
-rw-r--r--src/plugins/projectexplorer/ipotentialkit.cpp35
-rw-r--r--src/plugins/projectexplorer/ipotentialkit.h48
-rw-r--r--src/plugins/projectexplorer/projectexplorer.pro6
-rw-r--r--src/plugins/projectexplorer/targetsetuppage.cpp14
-rw-r--r--src/plugins/projectexplorer/targetsetuppage.h1
9 files changed, 290 insertions, 4 deletions
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index becab45e43..dbb32f2515 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -46,7 +46,8 @@ HEADERS += \
androiddeployqtstep.h \
certificatesmodel.h \
androiddeployqtwidget.h \
- createandroidmanifestwizard.h
+ createandroidmanifestwizard.h \
+ androidpotentialkit.h
SOURCES += \
androidconfigurations.cpp \
@@ -87,7 +88,8 @@ SOURCES += \
androiddeployqtstep.cpp \
certificatesmodel.cpp \
androiddeployqtwidget.cpp \
- createandroidmanifestwizard.cpp
+ createandroidmanifestwizard.cpp \
+ androidpotentialkit.cpp
FORMS += \
androidsettingswidget.ui \
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 41ebb56134..8017773e68 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -45,6 +45,7 @@
#include "androiddeployconfiguration.h"
#include "androidgdbserverkitinformation.h"
#include "androidmanifesteditorfactory.h"
+#include "androidpotentialkit.h"
#ifdef HAVE_QBS
# include "androidqbspropertyprovider.h"
#endif
@@ -81,6 +82,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
addAutoReleasedObject(new Internal::AndroidToolChainFactory);
addAutoReleasedObject(new Internal::AndroidDeployConfigurationFactory);
addAutoReleasedObject(new Internal::AndroidDeviceFactory);
+ addAutoReleasedObject(new Internal::AndroidPotentialKit);
ProjectExplorer::KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
// AndroidManifest.xml editor
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
new file mode 100644
index 0000000000..d55a23db6a
--- /dev/null
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "androidpotentialkit.h"
+#include "androidconstants.h"
+#include "androidconfigurations.h"
+
+#include <utils/detailswidget.h>
+#include <coreplugin/icore.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/kit.h>
+#include <projectexplorer/kitinformation.h>
+#include <qtsupport/qtversionmanager.h>
+#include <qtsupport/baseqtversion.h>
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+
+using namespace Android;
+using namespace Android::Internal;
+
+QWidget *AndroidPotentialKit::createWidget(QWidget *parent) const
+{
+ QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
+ foreach (ProjectExplorer::Kit *kit, kits) {
+ Core::Id deviceId = ProjectExplorer::DeviceKitInformation::deviceId(kit);
+ if (kit->isAutoDetected()
+ && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
+ && !kit->isSdkProvided()) {
+ return 0;
+ }
+ }
+
+ bool found = false;
+ foreach (QtSupport::BaseQtVersion *version, QtSupport::QtVersionManager::validVersions()) {
+ if (version->type() == QLatin1String(Constants::ANDROIDQT)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) // no android qt
+ return 0;
+
+ return new AndroidPotentialKitWidget(parent);
+}
+
+AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
+ : Utils::DetailsWidget(parent)
+{
+ setSummaryText(QLatin1String("<b>Create Android Kits</b>"));
+ //detailsWidget->setState(Utils::DetailsWidget::NoSummary);
+ QWidget *mainWidget = new QWidget(this);
+ setWidget(mainWidget);
+
+ QGridLayout *layout = new QGridLayout(mainWidget);
+ layout->setMargin(0);
+ QLabel *label = new QLabel;
+ label->setText(tr("Creator needs additional settings to enable Android support."
+ "You can configure those settings in the Options dialog."));
+ label->setWordWrap(true);
+ layout->addWidget(label, 0, 0, 1, 2);
+
+ QPushButton *openOptions = new QPushButton;
+ openOptions->setText(tr("Open Settings"));
+ openOptions->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ layout->addWidget(openOptions, 1, 1);
+
+ connect(openOptions, SIGNAL(clicked()),
+ this, SLOT(openOptions()));
+
+ connect(&AndroidConfigurations::instance(), SIGNAL(updated()),
+ this, SLOT(recheck()));
+}
+
+void AndroidPotentialKitWidget::openOptions()
+{
+ Core::ICore::showOptionsDialog(Constants::ANDROID_SETTINGS_CATEGORY,
+ Constants::ANDROID_SETTINGS_ID);
+}
+
+void AndroidPotentialKitWidget::recheck()
+{
+ QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
+ foreach (ProjectExplorer::Kit *kit, kits) {
+ Core::Id deviceId = ProjectExplorer::DeviceKitInformation::deviceId(kit);
+ if (kit->isAutoDetected()
+ && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
+ && !kit->isSdkProvided()) {
+ setVisible(false);
+ return;
+ }
+ }
+}
diff --git a/src/plugins/android/androidpotentialkit.h b/src/plugins/android/androidpotentialkit.h
new file mode 100644
index 0000000000..b1be760477
--- /dev/null
+++ b/src/plugins/android/androidpotentialkit.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef ANDROIDPOTENTIALKIT_H
+#define ANDROIDPOTENTIALKIT_H
+
+#include <projectexplorer/ipotentialkit.h>
+#include <utils/detailswidget.h>
+
+namespace Android {
+namespace Internal {
+
+class AndroidPotentialKit : public ProjectExplorer::IPotentialKit
+{
+ Q_OBJECT
+public:
+ QWidget *createWidget(QWidget *parent) const;
+};
+
+class AndroidPotentialKitWidget : public Utils::DetailsWidget
+{
+ Q_OBJECT
+public:
+ AndroidPotentialKitWidget(QWidget *parent);
+private slots:
+ void openOptions();
+ void recheck();
+};
+
+// TODO add "Download" links to the settings page?
+
+}
+}
+
+#endif // ANDROIDPOTENTIALKIT_H
diff --git a/src/plugins/projectexplorer/ipotentialkit.cpp b/src/plugins/projectexplorer/ipotentialkit.cpp
new file mode 100644
index 0000000000..e912e96fcf
--- /dev/null
+++ b/src/plugins/projectexplorer/ipotentialkit.cpp
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "ipotentialkit.h"
+
+ProjectExplorer::IPotentialKit::~IPotentialKit()
+{
+
+}
diff --git a/src/plugins/projectexplorer/ipotentialkit.h b/src/plugins/projectexplorer/ipotentialkit.h
new file mode 100644
index 0000000000..37003598ee
--- /dev/null
+++ b/src/plugins/projectexplorer/ipotentialkit.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef IPOTENTIALKIT_H
+#define IPOTENTIALKIT_H
+
+#include <QObject>
+#include "projectexplorer_export.h"
+
+namespace ProjectExplorer {
+
+class PROJECTEXPLORER_EXPORT IPotentialKit : public QObject
+{
+ Q_OBJECT
+public:
+ virtual ~IPotentialKit();
+ virtual QWidget *createWidget(QWidget *parent) const = 0;
+};
+
+}
+
+#endif // IPOTENTIALKIT_H
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 425920fc17..c03b4c473f 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -142,7 +142,8 @@ HEADERS += projectexplorer.h \
customtoolchain.h \
projectmacroexpander.h \
customparser.h \
- customparserconfigdialog.h
+ customparserconfigdialog.h \
+ ipotentialkit.h
SOURCES += projectexplorer.cpp \
abi.cpp \
@@ -270,7 +271,8 @@ SOURCES += projectexplorer.cpp \
customtoolchain.cpp \
projectmacroexpander.cpp \
customparser.cpp \
- customparserconfigdialog.cpp
+ customparserconfigdialog.cpp \
+ ipotentialkit.cpp
FORMS += processstep.ui \
editorsettingspropertiespage.ui \
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index 0b9c5e9a2d..30689aa050 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -39,6 +39,8 @@
#include "targetsetupwidget.h"
#include <coreplugin/icore.h>
+#include <extensionsystem/pluginmanager.h>
+#include <projectexplorer/ipotentialkit.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
@@ -162,6 +164,12 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) :
setTitle(tr("Kit Selection"));
+ QList<IPotentialKit *> potentialKits =
+ ExtensionSystem::PluginManager::instance()->getObjects<IPotentialKit>();
+ foreach (IPotentialKit *pk, potentialKits)
+ if (QWidget *w = pk->createWidget(this))
+ m_potentialWidgets.append(w);
+
QObject *km = KitManager::instance();
connect(km, SIGNAL(kitAdded(ProjectExplorer::Kit*)),
this, SLOT(handleKitAddition(ProjectExplorer::Kit*)));
@@ -176,6 +184,8 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) :
void TargetSetupPage::initializePage()
{
m_baseLayout->addWidget(m_importWidget);
+ foreach (QWidget *widget, m_potentialWidgets)
+ m_baseLayout->addWidget(widget);
m_baseLayout->addItem(m_spacer);
reset();
@@ -477,6 +487,8 @@ TargetSetupWidget *TargetSetupPage::addWidget(Kit *k)
return 0;
m_baseLayout->removeWidget(m_importWidget);
+ foreach (QWidget *widget, m_potentialWidgets)
+ m_baseLayout->removeWidget(widget);
m_baseLayout->removeItem(m_spacer);
widget->setKitSelected(m_preferredMatcher && m_preferredMatcher->matches(k));
@@ -484,6 +496,8 @@ TargetSetupWidget *TargetSetupPage::addWidget(Kit *k)
m_baseLayout->addWidget(widget);
m_baseLayout->addWidget(m_importWidget);
+ foreach (QWidget *widget, m_potentialWidgets)
+ m_baseLayout->addWidget(widget);
m_baseLayout->addItem(m_spacer);
connect(widget, SIGNAL(selectedToggled()),
diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h
index 7018b5a7b0..4e278629c1 100644
--- a/src/plugins/projectexplorer/targetsetuppage.h
+++ b/src/plugins/projectexplorer/targetsetuppage.h
@@ -123,6 +123,7 @@ private:
Internal::ImportWidget *m_importWidget;
QSpacerItem *m_spacer;
+ QList<QWidget *> m_potentialWidgets;
bool m_forceOptionHint;
};
View Lorry Controller Status