diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-11 09:43:41 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-11 09:43:41 (GMT) |
| commit | 3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (patch) | |
| tree | 880ceec3efd8979d5ceff6a58a1160f94e884e41 /configure | |
| parent | a958ab9c98481100870a87ee07b8e0abddbfc804 (diff) | |
| download | Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.zip Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.gz Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.bz2 | |
Eliminate some mentions of Trolltech.
Reviewed-by: Trust Me
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -400,7 +400,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for Qt for Embedded Linux." echo - echo "Please contact sales@trolltech.com to upgrade your license" + echo "Please contact qt-info@nokia.com to upgrade your license" echo "to include Qt for Embedded Linux, or install the" echo "Qt Open Source Edition if you intend to develop free software." exit 1 @@ -420,7 +420,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for the Qt/Mac platform." echo - echo "Please contact sales@trolltech.com to upgrade your license" + echo "Please contact qt-info@nokia.com to upgrade your license" echo "to include the Qt/Mac platform." exit 1 ;; @@ -439,7 +439,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for the Qt/X11 platform." echo - echo "Please contact sales@trolltech.com to upgrade your license to" + echo "Please contact qt-info@nokia.com to upgrade your license to" echo "include the Qt/X11 platform, or install the Qt Open Source Edition" echo "if you intend to develop free software." exit 1 @@ -2890,7 +2890,7 @@ fi #prefix if [ -z "$QT_INSTALL_PREFIX" ]; then if [ "$CFG_DEV" = "yes" ]; then - QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default + QT_INSTALL_PREFIX="$outpath" # In Qt Development, we use sandboxed builds by default elif [ "$PLATFORM_QWS" = "yes" ]; then QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" if [ "$PLATFORM" != "$XPLATFORM" ]; then @@ -3792,7 +3792,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your support and upgrade period has expired." echo echo " You are no longer licensed to use this version of Qt." - echo " Please contact sales@trolltech.com to renew your support" + echo " Please contact qt-info@nokia.com to renew your support" echo " and upgrades for this license." echo echo "NOTICE NOTICE NOTICE NOTICE" @@ -3810,7 +3810,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " support, nor are you entitled to use any more recent" echo " Qt releases." echo - echo " Please contact sales@trolltech.com to renew your" + echo " Please contact qt-info@nokia.com to renew your" echo " support and upgrades for this license." echo echo "WARNING WARNING WARNING WARNING" @@ -3825,7 +3825,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your Evaluation license has expired." echo echo " You are no longer licensed to use this software. Please" - echo " contact sales@trolltech.com to purchase license, or install" + echo " contact qt-info@nokia.com to purchase license, or install" echo " the Qt Open Source Edition if you intend to develop free" echo " software." echo |