Merge remote-tracking branch 'origin/krogoth' into dev

* origin/krogoth:
  AM: update revision
  Add appman versions of Kit and Qt to creator
  fonts: add recipe for GNU FreeFonts
  Add multiscreen automotive demo
  neptune: update to include fix for i18ndemo
  fonts: update URL for lohit font
  Update GammaRay to the same version as used by the QtAS 1.1 host tools
  emulator: correctly append qtsimulator configuration
  Update automotive components
  setup-environment: don't exit the shell on error
  neptune-ui: add runtime dependencies
  update meta-qt5 (merged upstream/master) SHA1 to manifest.xml
  AM: Add appman tools to automotive nativesdk
  configure-qtcreator: suppress unnecessary error
  Update GammaRay to the latest 2.7 branch

Conflicts:
	recipes-qt/automotive/neptune-ui_git.bb
	recipes-qt/automotive/qtapplicationmanager_git.bb
	recipes-qt/qt5/qtlocation_git.bbappend
	scripts/manifest.xml

Change-Id: I96601e7d7a1827a6631fe59d18101d2ad3b70871

2 files changed, 28 insertions, 3 deletions

diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index 0ebbe55..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,10 +99,12 @@ 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 || true
+${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
 
 if [ -n "${REMOVEONLY}" ]; then
     echo "Kit removed: ${NAME}"
@@ -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}"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index d9a6713..df53284 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -44,7 +44,7 @@ done
 THIS_SCRIPT="setup-environment.sh"
 if [ "$(basename -- $0)" = "${THIS_SCRIPT}" ]; then
     echo "Error: This script needs to be sourced. Please run as '. $0'"
-    exit 1
+    return 1
 fi
 
 if [ -z "$MACHINE" ]; then