From 5e0c7ebdf10ba4513671ad92ddf64e6989e58a1f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 15 Sep 2011 14:41:25 +0200 Subject: [PATCH] Make the default install path point to /usr/local/Qt-$VERSION Remove Trolltech from the default install path. Since QPA is the default now, so we don't need to treat it specially from regular Qt versions. It is the regular Qt version. Change-Id: I0bde75c90d2d5944be192e1249bc1a9371c70fcb Reviewed-by: Oswald Buddenhagen --- configure | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/configure b/configure index e985f52f93..c2349ada78 100755 --- a/configure +++ b/configure @@ -3538,22 +3538,8 @@ fi if [ -z "$QT_INSTALL_PREFIX" ]; then if [ "$CFG_DEV" = "yes" ]; then QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default - elif [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then - if [ "$PLATFORM_QPA" = "yes" ]; then - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtLighthouse-${QT_VERSION}" - else - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" - fi - if [ "$PLATFORM" != "$XPLATFORM" ]; then - QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}" - fi - elif [ -d "$EPOCROOT" ] && [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - QT_INSTALL_PREFIX="$EPOCROOT/epoc32/" - QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/" - fi else - QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION + QT_INSTALL_PREFIX="/usr/local/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Qt-$QT_VERSION fi fi QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"`