Files
qt-creator/src/plugins/android/androidsettingspage.cpp
Daniel Teske e433b83f64 AndroidSettingsWidget::apply(): Fix order of applying the changes
Create the device first, as otherwise no kits are generated and
create toolchains next. This should fix that the AndroidPotentialKit
 doesn't vanish in some cases.

Change-Id: Ia9141f72a146da157dc713c1e2f293747fa369bd
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 15:40:22 +01:00

74 lines
2.4 KiB
C++

/**************************************************************************
**
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
** 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 "androidsettingspage.h"
#include "androidsettingswidget.h"
#include "androidconstants.h"
#include "androidtoolchain.h"
#include <projectexplorer/toolchainmanager.h>
#include <QCoreApplication>
using namespace ProjectExplorer;
namespace Android {
namespace Internal {
AndroidSettingsPage::AndroidSettingsPage(QObject *parent)
: Core::IOptionsPage(parent)
{
setId(Constants::ANDROID_SETTINGS_ID);
setDisplayName(tr("Android Configurations"));
setCategory(Constants::ANDROID_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Android",
Constants::ANDROID_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON));
}
QWidget *AndroidSettingsPage::widget()
{
if (!m_widget)
m_widget = new AndroidSettingsWidget;
return m_widget;
}
void AndroidSettingsPage::apply()
{
m_widget->saveSettings();
}
void AndroidSettingsPage::finish()
{
delete m_widget;
}
} // namespace Internal
} // namespace Android