From 1047445648b7eb5b85107c00ea43885b44f891cd Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Aug 2009 17:04:56 +1000 Subject: Replace some mentions of Trolltech with more appropriate terms. Reviewed-by: Trust Me --- bin/syncqt | 2 +- configure | 14 +- demos/browser/browserapplication.cpp | 2 +- demos/browser/htmls/notfound.html | 4 +- demos/embedded/fluidlauncher/pictureflow.cpp | 430 ++++++++++----------- demos/embedded/fluidlauncher/pictureflow.h | 154 ++++---- demos/mediaplayer/main.cpp | 4 +- demos/qtdemo/mainwindow.cpp | 14 +- demos/qtdemo/mainwindow.h | 2 +- dist/README | 2 +- dist/changes-3.0.0 | 4 +- dist/changes-3.0.0-beta1 | 5 +- dist/changes-4.3.2 | 4 +- dist/changes-4.3.3 | 2 +- dist/changes-4.4.0 | 2 +- doc/src/codecs.qdoc | 16 +- doc/src/designer-manual.qdoc | 2 +- doc/src/dnd.qdoc | 2 +- doc/src/emb-porting.qdoc | 2 +- doc/src/porting4-obsoletedmechanism.qdocinc | 4 +- doc/src/qmsdev.qdoc | 2 +- .../snippets/code/src_corelib_tools_qbytearray.cpp | 8 +- .../snippets/code/src_gui_painting_qpainter.cpp | 2 +- .../snippets/code/src_qt3support_network_q3url.cpp | 4 +- doc/src/snippets/qstring/main.cpp | 4 +- examples/opengl/hellogl/glwidget.cpp | 10 +- examples/opengl/hellogl/glwidget.h | 4 +- examples/opengl/overpainting/glwidget.cpp | 14 +- examples/opengl/overpainting/glwidget.h | 4 +- examples/opengl/samplebuffers/glwidget.cpp | 6 +- examples/tools/completer/resources/wordlist.txt | 1 - .../tools/customcompleter/resources/wordlist.txt | 1 - examples/xml/dombookmarks/jennifer.xbel | 2 +- examples/xml/saxbookmarks/jennifer.xbel | 2 +- src/corelib/codecs/qtsciicodec.cpp | 2 +- src/corelib/codecs/qtsciicodec_p.h | 2 +- src/corelib/global/qglobal.h | 2 +- src/gui/itemviews/qdatawidgetmapper.cpp | 22 +- src/gui/kernel/qmotifdnd_x11.cpp | 2 +- src/gui/kernel/qwidget_mac.mm | 2 +- src/gui/text/qfontengine_p.h | 2 +- src/network/access/qftp.cpp | 2 +- src/network/ssl/qsslconfiguration.h | 2 +- src/network/ssl/qsslconfiguration_p.h | 2 +- src/plugins/codecs/jp/qeucjpcodec.h | 2 +- src/plugins/codecs/jp/qjiscodec.h | 2 +- src/plugins/codecs/jp/qjpunicode.h | 2 +- src/plugins/codecs/jp/qsjiscodec.h | 2 +- src/plugins/codecs/kr/qeuckrcodec.cpp | 2 +- src/plugins/codecs/tw/qbig5codec.h | 2 +- src/qt3support/network/q3ftp.cpp | 2 +- 51 files changed, 391 insertions(+), 398 deletions(-) diff --git a/bin/syncqt b/bin/syncqt index 589659f..01c519e 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,7 +1,7 @@ #!/usr/bin/perl -w ###################################################################### # -# Synchronizes Qt header files - internal Trolltech tool. +# Synchronizes Qt header files - internal development tool. # # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # Contact: Nokia Corporation (qt-info@nokia.com) diff --git a/configure b/configure index 7b7cc1c..fc87950b 100755 --- a/configure +++ b/configure @@ -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 @@ -2970,7 +2970,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 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 @@ -3881,7 +3881,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" @@ -3899,7 +3899,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" @@ -3914,7 +3914,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 diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp index 7a87b33..8262d22 100644 --- a/demos/browser/browserapplication.cpp +++ b/demos/browser/browserapplication.cpp @@ -79,7 +79,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) : QApplication(argc, argv) , m_localServer(0) { - QCoreApplication::setOrganizationName(QLatin1String("Trolltech")); + QCoreApplication::setOrganizationName(QLatin1String("Qt")); QCoreApplication::setApplicationName(QLatin1String("demobrowser")); QCoreApplication::setApplicationVersion(QLatin1String("0.1")); #ifdef Q_WS_QWS diff --git a/demos/browser/htmls/notfound.html b/demos/browser/htmls/notfound.html index b04a9f8..e89845a 100644 --- a/demos/browser/htmls/notfound.html +++ b/demos/browser/htmls/notfound.html @@ -49,8 +49,8 @@ ul {

%2

When connecting to: %3.