summaryrefslogtreecommitdiff
path: root/src/gui/inputmethod
diff options
context:
space:
mode:
authorjutaipal <juhani.taipale@digia.com>2012-12-10 07:28:43 -0800
committerjutaipal <juhani.taipale@digia.com>2012-12-10 07:28:43 -0800
commit50776dde6ea1e30b019a7b698533d96231a7f7a8 (patch)
treeb3d11ca49c43facbe5bb983c42de05fa416a56af /src/gui/inputmethod
parent5fe472abf55dbab32f3837ea904146addb82e747 (diff)
downloadqt4-tools-50776dde6ea1e30b019a7b698533d96231a7f7a8.tar.gz
Nokia to Digia changes
Diffstat (limited to 'src/gui/inputmethod')
-rw-r--r--src/gui/inputmethod/qinputcontext.cpp4
-rw-r--r--src/gui/inputmethod/qinputcontext.h2
-rw-r--r--src/gui/inputmethod/qinputcontext_p.h2
-rw-r--r--src/gui/inputmethod/qinputcontextfactory.cpp4
-rw-r--r--src/gui/inputmethod/qinputcontextfactory.h2
-rw-r--r--src/gui/inputmethod/qinputcontextplugin.cpp4
-rw-r--r--src/gui/inputmethod/qinputcontextplugin.h2
-rw-r--r--src/gui/inputmethod/qximinputcontext_p.h2
-rw-r--r--src/gui/inputmethod/qximinputcontext_x11.cpp2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 4ede287729..3138631f6d 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 931cd264b7..5a72e5739f 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 6217e6c00e..14d5b4cc4b 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 60be6fc26f..80ae51c0b8 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 1adb9328de..47ffffbb05 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 b2517a5d5a..306c726004 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 265f8ada2f..fed9a7efbd 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 97a6423511..a493af6618 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 9cee1bfc02..38a65a93b6 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