Commit 417b80c5 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Christian Kandeler
Browse files

make the android => qbs dependency optional



as qbs itself is optional

Change-Id: I1ff2d2f785ca206b379b305e783b9914081712b4
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 95c943a8
......@@ -40,8 +40,7 @@ HEADERS += \
androidmanifesteditorfactory.h \
androidmanifesteditor.h \
androidmanifesteditorwidget.h \
androidmanifestdocument.h \
androidqbspropertyprovider.h
androidmanifestdocument.h
SOURCES += \
androidconfigurations.cpp \
......@@ -76,8 +75,7 @@ SOURCES += \
androidmanifesteditorfactory.cpp \
androidmanifesteditor.cpp \
androidmanifesteditorwidget.cpp \
androidmanifestdocument.cpp \
androidqbspropertyprovider.cpp
androidmanifestdocument.cpp
FORMS += \
androidsettingswidget.ui \
......@@ -86,5 +84,13 @@ FORMS += \
addnewavddialog.ui \
androidcreatekeystorecertificate.ui
exists(../../shared/qbs/qbs.pro) {
HEADERS += \
androidqbspropertyprovider.h
SOURCES += \
androidqbspropertyprovider.cpp
DEFINES += HAVE_QBS
}
RESOURCES = android.qrc
DEFINES += ANDROID_LIBRARY
......@@ -8,7 +8,10 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "Qt4ProjectManager" }
Depends { name: "QbsProjectManager" }
Depends {
name: "QbsProjectManager"
condition: project.buildQbsProjectManager
}
Depends { name: "Debugger" }
Depends { name: "QmlDebug" }
Depends { name: "QtSupport" }
......@@ -21,6 +24,11 @@ QtcPlugin {
cpp.includePaths: base.concat("../../shared")
Properties {
condition: project.buildQbsProjectManager
cpp.defines: base.concat(['HAVE_QBS'])
}
files: [
"addnewavddialog.ui",
"android.qrc",
......@@ -73,8 +81,6 @@ QtcPlugin {
"androidpackageinstallationstep.h",
"androidplugin.cpp",
"androidplugin.h",
"androidqbspropertyprovider.cpp",
"androidqbspropertyprovider.h",
"androidqtversion.cpp",
"androidqtversion.h",
"androidqtversionfactory.cpp",
......@@ -99,4 +105,13 @@ QtcPlugin {
"javaparser.cpp",
"javaparser.h",
]
Group {
name: "Qbs Support"
condition: project.buildQbsProjectManager
files: [
"androidqbspropertyprovider.cpp",
"androidqbspropertyprovider.h",
]
}
}
......@@ -6,5 +6,8 @@ QTC_PLUGIN_DEPENDS += \
qt4projectmanager \
qtsupport \
texteditor \
analyzerbase \
qbsprojectmanager
analyzerbase
exists(../../shared/qbs/qbs.pro): \
QTC_PLUGIN_DEPENDS += \
qbsprojectmanager
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment