From ab96b851763f506e6168e1eb4e50273e95bf3c49 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 24 Apr 2012 12:35:34 +0200
Subject: [PATCH] Mark Android plugin as experimental

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>
---
 src/plugins/android/Android.pluginspec.in | 2 +-
 src/plugins/android/android.pro           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/android/Android.pluginspec.in b/src/plugins/android/Android.pluginspec.in
index 94083f57664..7ac3cb97c8b 100644
--- a/src/plugins/android/Android.pluginspec.in
+++ b/src/plugins/android/Android.pluginspec.in
@@ -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>
     <copyright>(C) 2010-2012 BogDan Vatra</copyright>
     <license>
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index d7168d8746d..c841fdbae01 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -4,6 +4,9 @@ TARGET = Android
 include(../../qtcreatorplugin.pri)
 include(android_dependencies.pri)
 
+isEmpty(ANDROID_ENABLE):ANDROID_EXPERIMENTAL_STR="true"
+else:ANDROID_EXPERIMENTAL_STR="false"
+
 QT += xml network
 
 HEADERS += \
@@ -73,5 +76,3 @@ FORMS += \
 RESOURCES = android.qrc
 DEFINES += QT_NO_CAST_TO_ASCII
 DEFINES += ANDROID_LIBRARY
-
-