diff options
| author | Oswald Buddenhagen <[email protected]> | 2013-08-21 13:28:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2013-08-21 17:29:55 +0200 |
| commit | 417b80c5449effcf92154fd55a86b427736e61a1 (patch) | |
| tree | e9daf56388f12f652a1455dec0bd9f0a04215387 /src/plugins/android/androidplugin.cpp | |
| parent | 95c943a8d6af5ad566eed3b7c771129242e5a439 (diff) | |
make the android => qbs dependency optional
as qbs itself is optional
Change-Id: I1ff2d2f785ca206b379b305e783b9914081712b4
Reviewed-by: Joerg Bornemann <[email protected]>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 86ed2894474..da22d925d14 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -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; } |