diff options
| -rw-r--r-- | bin/bin.pro | 14 | ||||
| -rwxr-xr-x | bin/qtcreator | 36 | ||||
| -rw-r--r-- | qtcreator.pri | 3 | ||||
| -rw-r--r-- | qtcreator.pro | 1 |
4 files changed, 1 insertions, 53 deletions
diff --git a/bin/bin.pro b/bin/bin.pro deleted file mode 100644 index 959be0aedc..0000000000 --- a/bin/bin.pro +++ /dev/null @@ -1,14 +0,0 @@ -include(../qtcreator.pri) - -TEMPLATE = app -TARGET = $$IDE_APP_WRAPPER -OBJECTS_DIR = - -PRE_TARGETDEPS = $$PWD/qtcreator - -QMAKE_LINK = cp $$PWD/qtcreator $@ && : IGNORE REST - -QMAKE_CLEAN = $$IDE_APP_WRAPPER - -target.path = /bin -INSTALLS += target diff --git a/bin/qtcreator b/bin/qtcreator deleted file mode 100755 index c9f51424fb..0000000000 --- a/bin/qtcreator +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -makeAbsolute() { - case "$1" in - /*) - # already absolute, return it - echo "$1" - ;; - *) - # relative, prepend $2 made absolute - echo `makeAbsolute "$2" "$PWD"`/"$1" | sed 's,/\.$,,' - ;; - esac -} - -if test -L "$0"; then - # Try readlink(1) - readlink=`type readlink 2>/dev/null` || readlink= - if test -n "$readlink"; then - # We have readlink(1), so we can use it - me=`readlink -nf "$0"` - else - # No readlink(1), so let's try ls -l - me=`ls -l "$0" | sed 's/^.*-> //'` - base=`dirname "$0"` - me=`makeAbsolute "$me" "$base"` - fi -else - me="$0" -fi - -bindir=`dirname "$me"` -libdir=`cd "${bindir}/../lib" ; pwd` -LD_LIBRARY_PATH="${libdir}:${libdir}/qtcreator:${LD_LIBRARY_PATH}" -export LD_LIBRARY_PATH -exec "${bindir}/qtcreator.bin" ${1+"$@"} diff --git a/qtcreator.pri b/qtcreator.pri index b4ca541b0f..dfae8f9ef1 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -67,8 +67,7 @@ macx { contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 IDE_APP_TARGET = qtcreator } else { - IDE_APP_WRAPPER = qtcreator - IDE_APP_TARGET = qtcreator.bin + IDE_APP_TARGET = qtcreator } IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins diff --git a/qtcreator.pro b/qtcreator.pro index 6593c0fd33..d6ee82b50b 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -11,4 +11,3 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = src share -unix:!macx:!isEmpty(copydata):SUBDIRS += bin |