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

make the android => qbs dependency optional

Browse Source 
as qbs itself is optional

Change-Id: I1ff2d2f785ca206b379b305e783b9914081712b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-08-21 13:28:03 +02:00
committed by Christian Kandeler
parent 95c943a8d6
commit 417b80c544
4 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,9 @@
#include "androiddeployconfiguration.h"
#include "androidgdbserverkitinformation.h"
#include "androidmanifesteditorfactory.h"
#include "androidqbspropertyprovider.h"
#ifdef HAVE_QBS
# include "androidqbspropertyprovider.h"
#endif
#include <coreplugin/mimedatabase.h>
#include <coreplugin/icore.h>
@@ -98,7 +100,9 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
connect(ProjectExplorer::DeviceManager::instance(), SIGNAL(devicesLoaded()),
this, SLOT(updateDevice()));
#ifdef HAVE_QBS
addAutoReleasedObject(new Internal::AndroidQBSPropertyProvider);
#endif
return true;
}