Merge remote-tracking branch 'origin/2.7'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134

src/plugins/android/androiddeploystep.cpp

@@ -210,6 +210,11 @@ void AndroidDeployStep::setDeployQASIPackagePath(const QString &package)
 void AndroidDeployStep::setUseLocalQtLibs(bool useLocal)
 {
     m_useLocalQtLibs = useLocal;
+
+    // ### Passes -1 for API level, which means it won't work with setups that require
+    // library selection based on API level. Use the old approach (command line argument)
+    // in these cases.
+    AndroidManager::setUseLocalLibs(target(), useLocal, -1);
 }
 
 bool AndroidDeployStep::runCommand(QProcess *buildProc,

src/plugins/android/androidmanager.cpp

@@ -223,6 +223,16 @@ bool AndroidManager::setVersionName(ProjectExplorer::Target *target, const QStri
     return saveManifest(target, doc);
 }
 
+bool AndroidManager::ensureIconAttribute(ProjectExplorer::Target *target)
+{
+    QDomDocument doc;
+    if (!openManifest(target, doc))
+        return false;
+    QDomElement applicationElem = doc.documentElement().firstChildElement(QLatin1String("application"));
+    applicationElem.setAttribute(QLatin1String("android:icon"), QLatin1String("@drawable/icon"));
+    return saveManifest(target, doc);
+}
+
 QString AndroidManager::targetSDK(ProjectExplorer::Target *target)
 {
     if (!createAndroidTemplatesIfNecessary(target))
@@ -251,7 +261,8 @@ QIcon AndroidManager::highDpiIcon(ProjectExplorer::Target *target)
 
 bool AndroidManager::setHighDpiIcon(ProjectExplorer::Target *target, const QString &iconFilePath)
 {
-    return setIcon(target, HighDPI, iconFilePath);
+    return ensureIconAttribute(target) &&
+            setIcon(target, HighDPI, iconFilePath);
 }
 
 QIcon AndroidManager::mediumDpiIcon(ProjectExplorer::Target *target)
@@ -261,7 +272,8 @@ QIcon AndroidManager::mediumDpiIcon(ProjectExplorer::Target *target)
 
 bool AndroidManager::setMediumDpiIcon(ProjectExplorer::Target *target, const QString &iconFilePath)
 {
-    return setIcon(target, MediumDPI, iconFilePath);
+    return ensureIconAttribute(target) &&
+            setIcon(target, MediumDPI, iconFilePath);
 }
 
 QIcon AndroidManager::lowDpiIcon(ProjectExplorer::Target *target)
@@ -271,7 +283,8 @@ QIcon AndroidManager::lowDpiIcon(ProjectExplorer::Target *target)
 
 bool AndroidManager::setLowDpiIcon(ProjectExplorer::Target *target, const QString &iconFilePath)
 {
-    return setIcon(target, LowDPI, iconFilePath);
+    return ensureIconAttribute(target) &&
+            setIcon(target, LowDPI, iconFilePath);
 }
 
 Utils::FileName AndroidManager::dirPath(ProjectExplorer::Target *target)
@@ -348,6 +361,62 @@ QString AndroidManager::targetApplication(ProjectExplorer::Target *target)
     return QString();
 }
 
+bool AndroidManager::setUseLocalLibs(ProjectExplorer::Target *target, bool useLocalLibs, int deviceAPILevel)
+{
+    // For Qt 4, the "use local libs" options is handled by passing command line arguments to the
+    // app, so no need to alter the AndroidManifest.xml
+    QtSupport::BaseQtVersion *baseQtVersion = QtSupport::QtKitInformation::qtVersion(target->kit());
+    if (baseQtVersion == 0 || baseQtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        return true;
+
+    QDomDocument doc;
+    if (!openManifest(target, doc))
+        return false;
+
+    QDomElement metadataElem = doc.documentElement().firstChildElement(QLatin1String("application")).firstChildElement(QLatin1String("activity")).firstChildElement(QLatin1String("meta-data"));
+
+    QString localLibs;
+    QString localJars;
+    QString staticInitClasses;
+    if (useLocalLibs) {
+        localLibs = loadLocalLibs(target, deviceAPILevel);
+        localJars = loadLocalJars(target, deviceAPILevel);
+        staticInitClasses = loadLocalJarsInitClasses(target, deviceAPILevel);
+    }
+
+    bool changedManifest = false;
+    while (!metadataElem.isNull()) {
+        if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.use_local_qt_libs")) {
+            if (metadataElem.attribute(QLatin1String("android:value")).toInt() != useLocalLibs) {
+                metadataElem.setAttribute(QLatin1String("android:value"), int(useLocalLibs));
+                changedManifest = true;
+            }
+        } else if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.load_local_libs")) {
+            if (metadataElem.attribute(QLatin1String("android:value")) != localLibs) {
+                metadataElem.setAttribute(QLatin1String("android:value"), localLibs);
+                changedManifest = true;
+            }
+        } else if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.load_local_jars")) {
+            if (metadataElem.attribute(QLatin1String("android:value")) != localJars) {
+                metadataElem.setAttribute(QLatin1String("android:value"), localJars);
+                changedManifest = true;
+            }
+        } else if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.static_init_classes")) {
+            if (metadataElem.attribute(QLatin1String("android:value")) != staticInitClasses) {
+                metadataElem.setAttribute(QLatin1String("android:value"), staticInitClasses);
+                changedManifest = true;
+            }
+        }
+
+        metadataElem = metadataElem.nextSiblingElement(QLatin1String("meta-data"));
+    }
+
+    if (changedManifest)
+        return saveManifest(target, doc);
+    else
+        return true;
+}
+
 bool AndroidManager::setTargetApplication(ProjectExplorer::Target *target, const QString &name)
 {
     QDomDocument doc;
@@ -905,6 +974,8 @@ bool AndroidManager::setIcon(ProjectExplorer::Target *target, IconType type, con
 
     const QString path = iconPath(target, type);
     QFile::remove(path);
+    QDir dir;
+    dir.mkpath(QFileInfo(path).absolutePath());
     return QFile::copy(iconFileName, path);
 }
 

src/plugins/android/androidmanager.h

@@ -78,12 +78,15 @@ public:
     static bool setMediumDpiIcon(ProjectExplorer::Target *target, const QString &iconFilePath);
     static QIcon lowDpiIcon(ProjectExplorer::Target *target);
     static bool setLowDpiIcon(ProjectExplorer::Target *target, const QString &iconFilePath);
+    static bool ensureIconAttribute(ProjectExplorer::Target *target);
 
     static QStringList availableTargetApplications(ProjectExplorer::Target *target);
     static QString targetApplication(ProjectExplorer::Target *target);
     static bool setTargetApplication(ProjectExplorer::Target *target, const QString &name);
     static QString targetApplicationPath(ProjectExplorer::Target *target);
 
+    static bool setUseLocalLibs(ProjectExplorer::Target *target, bool useLocalLibs, int deviceAPILevel);
+
     static QString targetSDK(ProjectExplorer::Target *target);
     static bool setTargetSDK(ProjectExplorer::Target *target, const QString &sdk);
 

src/plugins/android/androidpackagecreationwidget.cpp

@@ -32,6 +32,8 @@
 #include "androidconfigurations.h"
 #include "androidcreatekeystorecertificate.h"
 #include "androidmanager.h"
+#include "androiddeploystep.h"
+#include "androidglobal.h"
 #include "ui_androidpackagecreationwidget.h"
 
 #include <projectexplorer/project.h>
@@ -375,11 +377,25 @@ void AndroidPackageCreationWidget::setTarget(const QString &target)
 void AndroidPackageCreationWidget::setQtLibs(QModelIndex, QModelIndex)
 {
     AndroidManager::setQtLibs(m_step->target(), m_qtLibsModel->checkedItems());
+    AndroidDeployStep * const deployStep = AndroidGlobal::buildStep<AndroidDeployStep>(m_step->target()->activeDeployConfiguration());
+    if (deployStep->useLocalQtLibs()) {
+        // ### Passes -1 for API level, which means it won't work with setups that require
+        // library selection based on API level. Use the old approach (command line argument)
+        // in these cases.
+        AndroidManager::setUseLocalLibs(m_step->target(), true, -1);
+    }
 }
 
 void AndroidPackageCreationWidget::setPrebundledLibs(QModelIndex, QModelIndex)
 {
     AndroidManager::setPrebundledLibs(m_step->target(), m_prebundledLibs->checkedItems());
+    AndroidDeployStep * const deployStep = AndroidGlobal::buildStep<AndroidDeployStep>(m_step->target()->activeDeployConfiguration());
+    if (deployStep->useLocalQtLibs()) {
+        // ### Passes -1 for API level, which means it won't work with setups that require
+        // library selection based on API level. Use the old approach (command line argument)
+        // in these cases.
+        AndroidManager::setUseLocalLibs(m_step->target(), true, -1);
+    }
 }
 
 void AndroidPackageCreationWidget::prebundledLibSelected(const QModelIndex &index)

src/plugins/android/androidqtversion.cpp

@@ -42,6 +42,7 @@
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
 
+#include <projectexplorer/target.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/projectexplorer.h>
 
@@ -115,8 +116,18 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En
     if (!qt4pro || !qt4pro->activeTarget()
             || QtSupport::QtKitInformation::qtVersion(k)->type() != QLatin1String(Constants::ANDROIDQT))
         return;
+
+    Target *target = qt4pro->activeTarget();
+    if (DeviceTypeKitInformation::deviceTypeId(target->kit()) != Constants::ANDROID_DEVICE_TYPE)
+        return;
+    if (AndroidConfigurations::instance().config().ndkLocation.isEmpty()
+            || AndroidConfigurations::instance().config().sdkLocation.isEmpty())
+        return;
+    if (AndroidConfigurations::instance().sdkTargets().isEmpty())
+        return;
+
     env.set(QLatin1String("ANDROID_NDK_PLATFORM"),
-            AndroidConfigurations::instance().bestMatch(AndroidManager::targetSDK(qt4pro->activeTarget())));
+            AndroidConfigurations::instance().bestMatch(AndroidManager::targetSDK(target)));
 
 }
 

src/plugins/android/androidsettingswidget.cpp

@@ -241,7 +241,7 @@ bool AndroidSettingsWidget::checkNDK(const Utils::FileName &location)
 
     QSet<ProjectExplorer::Abi::Architecture> qtVersionsForArch;
     foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::instance()->versions()) {
-        if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT))
+        if (qtVersion->type() != QLatin1String(Constants::ANDROIDQT) || qtVersion->qtAbis().isEmpty())
             continue;
         qtVersionsForArch.insert(qtVersion->qtAbis().first().architecture());
     }