diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 08:36:02 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 08:36:02 (GMT) |
commit | 2d00cfe51ca07a934c4f172d0131156190a9b6e1 (patch) | |
tree | 635fed128ecf3271f50547eebf3432d67a22cf46 /tools | |
parent | 0cd421df59a25c5c3395d5e12c0a5842dc035ed0 (diff) | |
download | Qt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.zip Qt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.tar.gz Qt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.tar.bz2 |
Replace "Trolltech" with more appropriate terms.
Reviewed-by: Trust Me
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/tools.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/qdoc.conf | 2 | ||||
-rw-r--r-- | tools/qdoc3/yyindent.cpp | 2 | ||||
-rw-r--r-- | tools/xmlpatterns/main.cpp | 4 | ||||
-rw-r--r-- | tools/xmlpatterns/main.h | 2 | ||||
-rw-r--r-- | tools/xmlpatterns/qcoloringmessagehandler_p.h | 2 | ||||
-rw-r--r-- | tools/xmlpatterns/qcoloroutput.cpp | 2 | ||||
-rw-r--r-- | tools/xmlpatterns/qcoloroutput_p.h | 2 | ||||
-rw-r--r-- | tools/xmlpatternsvalidator/main.cpp | 2 | ||||
-rw-r--r-- | tools/xmlpatternsvalidator/main.h | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 1966ecc..6df2098 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -184,7 +184,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString // verify that we are licensed to use Qt for Windows CE if (dictionary["LICENSE_EXTENSION"] != "-EMBEDDED" && dictionary["LICENSE_EXTENSION"] != "-ALLOS") { cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl; - cout << "Please contact sales@trolltech.com to upgrade your license" << endl; + cout << "Please contact qt-info@nokia.com to upgrade your license" << endl; cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl; cout << "Qt Open Source Edition if you intend to develop free software." << endl; dictionary["DONE"] = "error"; diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf index a89fb64..31d44d5 100644 --- a/tools/linguist/qdoc.conf +++ b/tools/linguist/qdoc.conf @@ -3,7 +3,7 @@ DOCDIRS = $QTDIR/tools/linguist/doc EXAMPLEDIRS = $QTDIR/tools/linguist/tutorial OUTPUTDIR = $QTDIR/tools/linguist/doc/html BASE = file:$QTDIR/tools/linguist/doc/html/ -COMPANY = Trolltech +COMPANY = Nokia Corporation and/or its subsidiary(-ies) PRODUCT = Qt Linguist VERSIONSYM = QT_VERSION_STR DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_ diff --git a/tools/qdoc3/yyindent.cpp b/tools/qdoc3/yyindent.cpp index 66cf90b..9dc2883 100644 --- a/tools/qdoc3/yyindent.cpp +++ b/tools/qdoc3/yyindent.cpp @@ -719,7 +719,7 @@ static int indentForContinuationLine() delimDepth--; /* An unclosed delimiter is a good place to align at, - at least for some styles (including Trolltech's). + at least for some styles (including Qt's). */ if ( delimDepth == -1 ) hook = j; diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index de073eb..1bef118 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Patternist project on Trolltech Labs. +** This file is part of the Patternist project on Qt Labs. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -192,7 +192,7 @@ protected: #ifdef Q_OS_WIN /* If we don't open stdout in "binary" mode on Windows, it will translate - * 0xA into 0xD 0xA. See Trolltech task 173619, for an example. */ + * 0xA into 0xD 0xA. */ _setmode(_fileno(stdout), _O_BINARY); m_stdout = _wfdopen(_fileno(stdout), L"wb"); out->open(m_stdout, QIODevice::WriteOnly); diff --git a/tools/xmlpatterns/main.h b/tools/xmlpatterns/main.h index 058c80e..cccf4a7 100644 --- a/tools/xmlpatterns/main.h +++ b/tools/xmlpatterns/main.h @@ -2,7 +2,7 @@ * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) * ** - * ** This file is part of the Patternist project on Trolltech Labs. * ** + * ** This file is part of the Patternist project on Qt Labs. * ** * ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. diff --git a/tools/xmlpatterns/qcoloringmessagehandler_p.h b/tools/xmlpatterns/qcoloringmessagehandler_p.h index 6606590..d03a062 100644 --- a/tools/xmlpatterns/qcoloringmessagehandler_p.h +++ b/tools/xmlpatterns/qcoloringmessagehandler_p.h @@ -2,7 +2,7 @@ * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) * ** - * ** This file is part of the Patternist project on Trolltech Labs. * ** + * ** This file is part of the Patternist project on Qt Labs. * ** * ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. diff --git a/tools/xmlpatterns/qcoloroutput.cpp b/tools/xmlpatterns/qcoloroutput.cpp index 04ec78b..d715e71 100644 --- a/tools/xmlpatterns/qcoloroutput.cpp +++ b/tools/xmlpatterns/qcoloroutput.cpp @@ -2,7 +2,7 @@ * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) * ** - * ** This file is part of the Patternist project on Trolltech Labs. + * ** This file is part of the Patternist project on Qt Labs. * ** * ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/xmlpatterns/qcoloroutput_p.h b/tools/xmlpatterns/qcoloroutput_p.h index fecb517..49a515e 100644 --- a/tools/xmlpatterns/qcoloroutput_p.h +++ b/tools/xmlpatterns/qcoloroutput_p.h @@ -2,7 +2,7 @@ * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) * ** - * ** This file is part of the Patternist project on Trolltech Labs. * ** + * ** This file is part of the Patternist project on Qt Labs. * ** * ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. diff --git a/tools/xmlpatternsvalidator/main.cpp b/tools/xmlpatternsvalidator/main.cpp index f89a176..5a2877f 100644 --- a/tools/xmlpatternsvalidator/main.cpp +++ b/tools/xmlpatternsvalidator/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Patternist project on Trolltech Labs. +** This file is part of the Patternist project on Qt Labs. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h index 7839e70..716bffd 100644 --- a/tools/xmlpatternsvalidator/main.h +++ b/tools/xmlpatternsvalidator/main.h @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** - ** This file is part of the Patternist project on Trolltech Labs. * ** + ** This file is part of the Patternist project on Qt Labs. * ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. |