summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-04-23 10:06:06 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-04-24 04:36:38 +0000
commit4be5ca22ed0596dc06e0cd598c103da825f50edd (patch)
treee47c7a53911c79988d195f8746b03519756d7ddc
parent6e3ac7bfe108acf3e84d073f9067302a39709f2f (diff)
downloadmeta-boot2qt-4be5ca22ed0596dc06e0cd598c103da825f50edd.tar.gz
Revert "Add appman versions of Kit and Qt to creator"
Separate AppMan Kit is no longer required. This reverts commit 40b299399c5fc3d14156f720e33e22d7a50f1f20. Change-Id: I37fc67b1973c3c27f1e04d4e47765cda5fdc3c45 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rwxr-xr-xscripts/configure-qtcreator.sh27
1 files changed, 1 insertions, 26 deletions
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index d6e9c07..86a15e8 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -35,7 +35,7 @@ CONFIG=""
35 35
36printUsage () 36printUsage ()
37{ 37{
38 echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>] [--appman]" 38 echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]"
39} 39}
40 40
41while test -n "$1"; do 41while test -n "$1"; do
@@ -43,9 +43,6 @@ while test -n "$1"; do
43 "--remove") 43 "--remove")
44 REMOVEONLY=1 44 REMOVEONLY=1
45 ;; 45 ;;
46 "--appman")
47 APPMAN=1
48 ;;
49 "--qtcreator") 46 "--qtcreator")
50 shift 47 shift
51 QTCREATOR=$1 48 QTCREATOR=$1
@@ -99,9 +96,7 @@ NAME=${NAME:-"Custom Qt ${RELEASE} ${MACHINE}"}
99BASEID="byos.${RELEASE}.${MACHINE}" 96BASEID="byos.${RELEASE}.${MACHINE}"
100 97
101${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true 98${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true
102${SDKTOOL} rmKit --id ${BASEID}.am.kit 2>/dev/null || true
103${SDKTOOL} rmQt --id ${BASEID}.qt || true 99${SDKTOOL} rmQt --id ${BASEID}.qt || true
104${SDKTOOL} rmQt --id ${BASEID}.am.qt || true
105${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true 100${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true
106${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true 101${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true
107${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true 102${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
@@ -150,24 +145,4 @@ ${SDKTOOL} addKit \
150 --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ 145 --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
151 --mkspec "${MKSPEC}" 146 --mkspec "${MKSPEC}"
152 147
153if [ -n "${APPMAN}" ]; then
154 ${SDKTOOL} addQt \
155 --id "${BASEID}.am.qt" \
156 --name "${NAME} [Application Manager]" \
157 --type "AM.Qt" \
158 --qmake "$(type -p qmake)"
159
160 ${SDKTOOL} addKit \
161 --id "${BASEID}.am.kit" \
162 --name "${NAME} [Application Manager]" \
163 --qt "${BASEID}.am.qt" \
164 --debuggerid "${BASEID}.gdb" \
165 --sysroot "${SDKTARGETSYSROOT}" \
166 --devicetype "AM.Device.Type" \
167 --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
168 --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
169 --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
170 --mkspec "${MKSPEC}"
171fi
172
173echo "Configured Qt Creator with new kit: ${NAME}" 148echo "Configured Qt Creator with new kit: ${NAME}"