feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
This commit is contained in:
Eike Ziller
2013-03-04 15:07:19 +01:00
parent 04f2533c36 fde3803ca8
commit 7545ce072f
79 changed files with 1070 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidconfigurations.cpp
View File

@@ -591,11 +591,6 @@ void AndroidConfigurations::updateAutomaticKitList()
continue;
if (k->isSdkProvided())
continue;
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain((k));
if (!tc)
continue;
if (tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
continue;
existingKits << k;
}

14
src/plugins/android/androidplugin.cpp
View File

@@ -74,16 +74,14 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
addAutoReleasedObject(new Internal::AndroidDeployConfigurationFactory);
addAutoReleasedObject(new Internal::AndroidDeviceFactory);
ProjectExplorer::KitManager::instance()->registerKitInformation(new Internal::AndroidGdbServerKitInformation);
return true;
}
void AndroidPlugin::extensionsInitialized()
{
ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance();
if (dm->find(Core::Id(Constants::ANDROID_DEVICE_ID)).isNull())
dm->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()),
ProjectExplorer::DeviceManager::instance()
->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
this, SLOT(kitsRestored()));
return true;
}
void AndroidPlugin::kitsRestored()

3
src/plugins/android/androidplugin.h
View File

@@ -43,7 +43,8 @@ public:
AndroidPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
void extensionsInitialized() { }
private slots:
void kitsRestored();
};