From 40b299399c5fc3d14156f720e33e22d7a50f1f20 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 15 Mar 2017 12:23:21 +0200
Subject: Add appman versions of Kit and Qt to creator

The application manager plugin needs own versions of Qt and Kit to work
correctly. Those can be enabled with --appman argument.

Change-Id: I089366367dad310f15b10d727931b0be46a97d93
Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>
---
 scripts/configure-qtcreator.sh | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index 35b08b4..c1a3e8e 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -35,7 +35,7 @@ CONFIG=""
 
 printUsage ()
 {
-    echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]"
+    echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>] [--appman]"
 }
 
 while test -n "$1"; do
@@ -43,6 +43,9 @@ while test -n "$1"; do
     "--remove")
       REMOVEONLY=1
       ;;
+    "--appman")
+      APPMAN=1
+      ;;
     "--qtcreator")
       shift
       QTCREATOR=$1
@@ -96,7 +99,9 @@ NAME=${NAME:-"Custom Qt ${RELEASE} ${MACHINE}"}
 BASEID="byos.${RELEASE}.${MACHINE}"
 
 ${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true
+${SDKTOOL} rmKit --id ${BASEID}.am.kit 2>/dev/null || true
 ${SDKTOOL} rmQt --id ${BASEID}.qt || true
+${SDKTOOL} rmQt --id ${BASEID}.am.qt || true
 ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true
 ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true
 ${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
@@ -145,4 +150,24 @@ ${SDKTOOL} addKit \
     --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
     --mkspec "${MKSPEC}"
 
+if [ -n "${APPMAN}" ]; then
+    ${SDKTOOL} addQt \
+        --id "${BASEID}.am.qt" \
+        --name "${NAME} [Application Manager]" \
+        --type "AM.Qt" \
+        --qmake "$(type -p qmake)"
+
+    ${SDKTOOL} addKit \
+        --id "${BASEID}.am.kit" \
+        --name "${NAME} [Application Manager]" \
+        --qt "${BASEID}.am.qt" \
+        --debuggerid "${BASEID}.gdb" \
+        --sysroot "${SDKTARGETSYSROOT}" \
+        --devicetype "AM.Device.Type" \
+        --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
+        --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
+        --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
+        --mkspec "${MKSPEC}"
+fi
+
 echo "Configured Qt Creator with new kit: ${NAME}"
-- 
cgit v1.2.3-54-g00ecf