forked from qt-creator/qt-creator
make the android => qbs dependency optional
as qbs itself is optional Change-Id: I1ff2d2f785ca206b379b305e783b9914081712b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
committed by
Christian Kandeler
parent
95c943a8d6
commit
417b80c544
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user