diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-04-23 10:06:06 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-04-24 04:36:38 +0000 |
| commit | 4be5ca22ed0596dc06e0cd598c103da825f50edd (patch) | |
| tree | e47c7a53911c79988d195f8746b03519756d7ddc | |
| parent | 6e3ac7bfe108acf3e84d073f9067302a39709f2f (diff) | |
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-x | scripts/configure-qtcreator.sh | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh index d6e9c07d..86a15e8c 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>] [--appman]" + echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]" } while test -n "$1"; do @@ -43,9 +43,6 @@ while test -n "$1"; do "--remove") REMOVEONLY=1 ;; - "--appman") - APPMAN=1 - ;; "--qtcreator") shift QTCREATOR=$1 @@ -99,9 +96,7 @@ 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 @@ -150,24 +145,4 @@ ${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}" |