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

1 files changed, 1 insertions, 1 deletions

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