From 50776dde6ea1e30b019a7b698533d96231a7f7a8 Mon Sep 17 00:00:00 2001 From: jutaipal Date: Mon, 10 Dec 2012 07:28:43 -0800 Subject: Nokia to Digia changes --- examples/activeqt/multiple/multipleax.rc | 2 +- examples/activeqt/wrapper/wrapperax.rc | 2 +- qmake/option.cpp | 2 +- src/gui/dialogs/qmessagebox.cpp | 4 ++-- src/gui/inputmethod/qinputcontext.cpp | 4 ++-- src/gui/inputmethod/qinputcontext.h | 2 +- src/gui/inputmethod/qinputcontext_p.h | 2 +- src/gui/inputmethod/qinputcontextfactory.cpp | 4 ++-- src/gui/inputmethod/qinputcontextfactory.h | 2 +- src/gui/inputmethod/qinputcontextplugin.cpp | 4 ++-- src/gui/inputmethod/qinputcontextplugin.h | 2 +- src/gui/inputmethod/qximinputcontext_p.h | 2 +- src/gui/inputmethod/qximinputcontext_x11.cpp | 2 +- src/gui/itemviews/qdatawidgetmapper.cpp | 2 +- src/gui/kernel/qmotifdnd_x11.cpp | 2 +- src/gui/painting/qprintengine_pdf.cpp | 2 +- src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp | 2 +- src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h | 2 +- src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp | 2 +- src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h | 2 +- src/qt_targets.pri | 2 +- src/xmlpatterns/functions/qsystempropertyfn.cpp | 2 +- tests/auto/headers/tst_headers.cpp | 2 +- util/s60pixelmetrics/pm_mapper.pkg | 6 +++--- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/activeqt/multiple/multipleax.rc b/examples/activeqt/multiple/multipleax.rc index c9ff8b2..2c407e8 100644 --- a/examples/activeqt/multiple/multipleax.rc +++ b/examples/activeqt/multiple/multipleax.rc @@ -15,7 +15,7 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)" + VALUE "CompanyName", "Digia Plc" VALUE "FileDescription", "Multiple Example (ActiveQt)" VALUE "FileVersion", "1.0.0.0" VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)." diff --git a/examples/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc index b043b93..3147c48 100644 --- a/examples/activeqt/wrapper/wrapperax.rc +++ b/examples/activeqt/wrapper/wrapperax.rc @@ -15,7 +15,7 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)" + VALUE "CompanyName", "Digia Plc" VALUE "FileDescription", "Wrapper Example (ActiveQt)" VALUE "FileVersion", "1.0.0.0" VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)." diff --git a/qmake/option.cpp b/qmake/option.cpp index 6e9c5e7..b4ac5ae 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -254,7 +254,7 @@ Option::parseCommandLine(int argc, char **argv, int skip) qmake_version(), QT_VERSION_STR, QLibraryInfo::location(QLibraryInfo::LibrariesPath).toLatin1().constData()); #ifdef QMAKE_OPENSOURCE_VERSION - fprintf(stdout, "QMake is Open Source software from Nokia Corporation and/or its subsidiary(-ies).\n"); + fprintf(stdout, "QMake is Open Source software from Digia Plc.\n"); #endif return Option::QMAKE_CMDLINE_BAIL; } else if(opt == "h" || opt == "help") { diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 53bba36..ceaf237 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1770,10 +1770,10 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "use such applications in combination with software subject to the " "terms of the GNU GPL version 3.0 or where you are otherwise willing " "to comply with the terms of the GNU GPL version 3.0.

" - "

Please see qt.nokia.com/products/licensing " + "

Please see qt.digia.com/products/licensing " "for an overview of Qt licensing.

" "

Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).

" - "

Qt is a Nokia product. See qt.nokia.com " + "

Qt is a Digia product. See qt.digia.com " "for more information.

" ); QMessageBox *msgBox = new QMessageBox(parent); diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp index 4ede287..3138631 100644 --- a/src/gui/inputmethod/qinputcontext.cpp +++ b/src/gui/inputmethod/qinputcontext.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are @@ -130,7 +130,7 @@ QT_BEGIN_NAMESPACE \legalese Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. - This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own + This file is written to contribute to Digia Plc under their own license. You may use this file under your Qt license. Following description is copied from their original file headers. Contact immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h index 931cd26..5a72e57 100644 --- a/src/gui/inputmethod/qinputcontext.h +++ b/src/gui/inputmethod/qinputcontext.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontext_p.h b/src/gui/inputmethod/qinputcontext_p.h index 6217e6c..14d5b4c 100644 --- a/src/gui/inputmethod/qinputcontext_p.h +++ b/src/gui/inputmethod/qinputcontext_p.h @@ -57,7 +57,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp index 60be6fc..80ae51c 100644 --- a/src/gui/inputmethod/qinputcontextfactory.cpp +++ b/src/gui/inputmethod/qinputcontextfactory.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are @@ -114,7 +114,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, \legalese Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. - This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own + This file is written to contribute to Digia Plc under their own license. You may use this file under your Qt license. Following description is copied from their original file headers. Contact immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontextfactory.h b/src/gui/inputmethod/qinputcontextfactory.h index 1adb932..47ffffb 100644 --- a/src/gui/inputmethod/qinputcontextfactory.h +++ b/src/gui/inputmethod/qinputcontextfactory.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontextplugin.cpp b/src/gui/inputmethod/qinputcontextplugin.cpp index b2517a5d..306c726 100644 --- a/src/gui/inputmethod/qinputcontextplugin.cpp +++ b/src/gui/inputmethod/qinputcontextplugin.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE \legalese Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. - This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own + This file is written to contribute to Digia Plc under their own license. You may use this file under your Qt license. Following description is copied from their original file headers. Contact immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qinputcontextplugin.h b/src/gui/inputmethod/qinputcontextplugin.h index 265f8ad..fed9a7e 100644 --- a/src/gui/inputmethod/qinputcontextplugin.h +++ b/src/gui/inputmethod/qinputcontextplugin.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qximinputcontext_p.h b/src/gui/inputmethod/qximinputcontext_p.h index 97a6423..a493af6 100644 --- a/src/gui/inputmethod/qximinputcontext_p.h +++ b/src/gui/inputmethod/qximinputcontext_p.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp index 9cee1bf..38a65a9 100644 --- a/src/gui/inputmethod/qximinputcontext_x11.cpp +++ b/src/gui/inputmethod/qximinputcontext_x11.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2003-2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp index a765fe3..241121d 100644 --- a/src/gui/itemviews/qdatawidgetmapper.cpp +++ b/src/gui/itemviews/qdatawidgetmapper.cpp @@ -292,7 +292,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed() \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 0 After the call to toFirst(), \c mySpinBox displays the value \c{1}, \c myLineEdit - displays \c {Nokia Corporation and/or its subsidiary(-ies)} and \c myCountryChooser displays \c{Oslo}. The + displays \c {Digia Plc} and \c myCountryChooser displays \c{Oslo}. The navigational functions toFirst(), toNext(), toPrevious(), toLast() and setCurrentIndex() can be used to navigate in the model and update the widgets with contents from the model. diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp index 2a01d91..1e40e7c 100644 --- a/src/gui/kernel/qmotifdnd_x11.cpp +++ b/src/gui/kernel/qmotifdnd_x11.cpp @@ -65,7 +65,7 @@ in doc/dnd.doc, where the documentation system can see it. */ /* Only requires Xlib layer - not MT safe */ /* Author: Daniel Dardailler, daniel@x.org */ /* Adapted by: Matt Koss, koss@napri.sk */ -/* Further adaptions by: Nokia Corporation and/or its subsidiary(-ies) */ +/* Further adaptions by: Digia Plc */ /***********************************************************/ #include "qplatformdefs.h" diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp index 4cd0375..ad5dc58 100644 --- a/src/gui/painting/qprintengine_pdf.cpp +++ b/src/gui/painting/qprintengine_pdf.cpp @@ -948,7 +948,7 @@ void QPdfEnginePrivate::writeInfo() array.append((*(utf16Creator + i)) >> 8); array.append((*(utf16Creator + i)) & 0xff); } - array.append(")\n/Producer (Qt " QT_VERSION_STR " (C) 2010 Nokia Corporation and/or its subsidiary(-ies))\n"); + array.append(")\n/Producer (Qt " QT_VERSION_STR " (C) 2010 Digia Plc)\n"); write(array); QDateTime now = QDateTime::currentDateTime().toUTC(); diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp index 6b0803d..9be0932 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** licence. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h index a8e0458..7082b46 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** licence. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp index 2a84f9e..833b121 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp @@ -46,7 +46,7 @@ ** ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h index 2889634..c859b1c 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h @@ -46,7 +46,7 @@ ** ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** -** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own +** This file is written to contribute to Digia Plc under their own ** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are diff --git a/src/qt_targets.pri b/src/qt_targets.pri index 5483983..9241f12 100644 --- a/src/qt_targets.pri +++ b/src/qt_targets.pri @@ -1,4 +1,4 @@ -QMAKE_TARGET_COMPANY = Nokia Corporation and/or its subsidiary(-ies) +QMAKE_TARGET_COMPANY = Digia Plc QMAKE_TARGET_PRODUCT = Qt4 QMAKE_TARGET_DESCRIPTION = C++ application development framework. QMAKE_TARGET_COPYRIGHT = Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). diff --git a/src/xmlpatterns/functions/qsystempropertyfn.cpp b/src/xmlpatterns/functions/qsystempropertyfn.cpp index 9768273..ddc64ed 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn.cpp +++ b/src/xmlpatterns/functions/qsystempropertyfn.cpp @@ -80,7 +80,7 @@ QString SystemPropertyFN::retrieveProperty(const QXmlName name) */ return QString::number(1.20); case StandardLocalNames::vendor: - return QLatin1String("Nokia Corporation and/or its subsidiary(-ies), a Nokia Company"); + return QLatin1String("Digia Plc"); case StandardLocalNames::vendor_url: return QLatin1String("http://qt.nokia.com/"); case StandardLocalNames::product_name: diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index 9b1299e..36b6475 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -77,7 +77,7 @@ private: }; tst_Headers::tst_Headers() : - copyrightPattern("\\*\\* Copyright \\(C\\) 20[0-9][0-9] Nokia Corporation and/or its subsidiary\\(-ies\\)."), + copyrightPattern("\\*\\* Copyright \\(C\\) 20[0-9][0-9] Digia Plc and/or its subsidiary\\(-ies\\)."), licensePattern("\\*\\* \\$QT_BEGIN_LICENSE:(LGPL|BSD|3RDPARTY|LGPL-ONLY)\\$"), moduleTest(QLatin1String("\\*\\* This file is part of the .+ of the Qt Toolkit.")) { diff --git a/util/s60pixelmetrics/pm_mapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg index e095275..afa8a8d 100644 --- a/util/s60pixelmetrics/pm_mapper.pkg +++ b/util/s60pixelmetrics/pm_mapper.pkg @@ -8,12 +8,12 @@ ; Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ; This material, including documentation and any related ; computer programs, is protected by copyright controlled by -; Nokia Corporation. All rights are reserved. Copying, +; Digia Plc. All rights are reserved. Copying, ; including reproducing, storing, adapting or translating, any ; or all of this material requires the prior written consent of -; Nokia Corporation. This material also contains confidential +; Digia Plc. This material also contains confidential ; information which may not be disclosed to others without the -; prior written consent of Nokia Corporation. +; prior written consent of Digia Plc. ; ============================================================================== -- cgit v0.12