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

Mark Android plugin as experimental

Browse Source 
That disables it by default, pass ANDROID_ENABLE to qmake -r to change the
default. The plugin is always built, thus it can be enabled/disabled in the
settings.

Change-Id: I29894f0fe1672a1920b43d38999717ce8b48868f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Teske
2012-04-24 12:35:34 +02:00
parent 6aaed915e4
commit ab96b85176
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/Android.pluginspec.in
View File

@@ -1,4 +1,4 @@
<plugin name=\"Android\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> <plugin name=\"Android\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$ANDROID_EXPERIMENTAL_STR\>
<vendor>KDE Necessitas</vendor> <vendor>KDE Necessitas</vendor>
<copyright>(C) 2010-2012 BogDan Vatra</copyright> <copyright>(C) 2010-2012 BogDan Vatra</copyright>
<license> <license>

5
src/plugins/android/android.pro
View File

@@ -4,6 +4,9 @@ TARGET = Android
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(android_dependencies.pri) include(android_dependencies.pri)
isEmpty(ANDROID_ENABLE):ANDROID_EXPERIMENTAL_STR="true"
else:ANDROID_EXPERIMENTAL_STR="false"
QT += xml network QT += xml network
HEADERS += \ HEADERS += \
@@ -73,5 +76,3 @@ FORMS += \
RESOURCES = android.qrc RESOURCES = android.qrc
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII
DEFINES += ANDROID_LIBRARY DEFINES += ANDROID_LIBRARY