More license test fixes

This change should have really been part of
I4a4c08123be144a0f3c2c9ce987f5ce1e9ff8bb4 but resolving the conflicts
across 300+ files is no fun.

Change-Id: Ic14b52c6e27c1924419446b7f876954dc7bf1450
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>

36 files changed, 36 insertions, 40 deletions

diff --git a/examples/contacts/qmlcontactslistview/ContactEditor.qml b/examples/contacts/qmlcontactslistview/ContactEditor.qml
index 46a47e3a4..4786bd9d7 100644
--- a/examples/contacts/qmlcontactslistview/ContactEditor.qml
+++ b/examples/contacts/qmlcontactslistview/ContactEditor.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
index 2dce75b8d..78e296b9a 100644
--- a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
+++ b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/contacts/qmlcontactslistview/GenericButton.qml b/examples/contacts/qmlcontactslistview/GenericButton.qml
index 8f932e89e..92f51d035 100644
--- a/examples/contacts/qmlcontactslistview/GenericButton.qml
+++ b/examples/contacts/qmlcontactslistview/GenericButton.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/contacts/qmlcontactslistview/doc/src/qmlcontactslistview.qdoc b/examples/contacts/qmlcontactslistview/doc/src/qmlcontactslistview.qdoc
index 0d15f3780..f30014f5b 100644
--- a/examples/contacts/qmlcontactslistview/doc/src/qmlcontactslistview.qdoc
+++ b/examples/contacts/qmlcontactslistview/doc/src/qmlcontactslistview.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt PIM Module.
@@ -21,7 +21,6 @@
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
 ** will be met: http://www.gnu.org/copyleft/fdl.html.
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/contacts/qmlcontactslistview/qmlcontactslistview.qml b/examples/contacts/qmlcontactslistview/qmlcontactslistview.qml
index 450d43be0..b561de23d 100644
--- a/examples/contacts/qmlcontactslistview/qmlcontactslistview.qml
+++ b/examples/contacts/qmlcontactslistview/qmlcontactslistview.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/organizer/calendardemo/doc/src/calendardemo.qdoc b/examples/organizer/calendardemo/doc/src/calendardemo.qdoc
index ec67ad896..495571c98 100644
--- a/examples/organizer/calendardemo/doc/src/calendardemo.qdoc
+++ b/examples/organizer/calendardemo/doc/src/calendardemo.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt PIM Module.
@@ -21,7 +21,6 @@
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
 ** will be met: http://www.gnu.org/copyleft/fdl.html.
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/organizer/calendardemo/src/addcalendarpage.cpp b/examples/organizer/calendardemo/src/addcalendarpage.cpp
index 7ba8ee4d5..690f6410e 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.cpp
+++ b/examples/organizer/calendardemo/src/addcalendarpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/addcalendarpage.h b/examples/organizer/calendardemo/src/addcalendarpage.h
index 581f93943..0f7480130 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.h
+++ b/examples/organizer/calendardemo/src/addcalendarpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp
index 067ab35f1..9b03382ae 100644
--- a/examples/organizer/calendardemo/src/calendardemo.cpp
+++ b/examples/organizer/calendardemo/src/calendardemo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/calendardemo.h b/examples/organizer/calendardemo/src/calendardemo.h
index adfb73c8d..444c1ee7b 100644
--- a/examples/organizer/calendardemo/src/calendardemo.h
+++ b/examples/organizer/calendardemo/src/calendardemo.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/daypage.cpp b/examples/organizer/calendardemo/src/daypage.cpp
index fb5ef719e..06d245d5c 100644
--- a/examples/organizer/calendardemo/src/daypage.cpp
+++ b/examples/organizer/calendardemo/src/daypage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/daypage.h b/examples/organizer/calendardemo/src/daypage.h
index ac79d088f..8ae59a836 100644
--- a/examples/organizer/calendardemo/src/daypage.h
+++ b/examples/organizer/calendardemo/src/daypage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.cpp b/examples/organizer/calendardemo/src/editcalendarspage.cpp
index bb5ba965f..22a4a3807 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.cpp
+++ b/examples/organizer/calendardemo/src/editcalendarspage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.h b/examples/organizer/calendardemo/src/editcalendarspage.h
index 679dbb902..bce29bcaf 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.h
+++ b/examples/organizer/calendardemo/src/editcalendarspage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/eventeditpage.cpp b/examples/organizer/calendardemo/src/eventeditpage.cpp
index 23f168522..8e8428059 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventeditpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/eventeditpage.h b/examples/organizer/calendardemo/src/eventeditpage.h
index 71f4437eb..58525fd90 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.h
+++ b/examples/organizer/calendardemo/src/eventeditpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
index 1af31fb6f..f145c4f36 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
index 6bc5e8af4..5f8e798c8 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/journaleditpage.cpp b/examples/organizer/calendardemo/src/journaleditpage.cpp
index 257cbb5df..e644a2ce5 100644
--- a/examples/organizer/calendardemo/src/journaleditpage.cpp
+++ b/examples/organizer/calendardemo/src/journaleditpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/journaleditpage.h b/examples/organizer/calendardemo/src/journaleditpage.h
index 7d1ee1dd3..b89bef22a 100644
--- a/examples/organizer/calendardemo/src/journaleditpage.h
+++ b/examples/organizer/calendardemo/src/journaleditpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/main.cpp b/examples/organizer/calendardemo/src/main.cpp
index 3d59447ca..6121906c6 100644
--- a/examples/organizer/calendardemo/src/main.cpp
+++ b/examples/organizer/calendardemo/src/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/monthpage.cpp b/examples/organizer/calendardemo/src/monthpage.cpp
index 8824fea42..23bc017e6 100644
--- a/examples/organizer/calendardemo/src/monthpage.cpp
+++ b/examples/organizer/calendardemo/src/monthpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/monthpage.h b/examples/organizer/calendardemo/src/monthpage.h
index c53d2cab1..0ca7ce1a1 100644
--- a/examples/organizer/calendardemo/src/monthpage.h
+++ b/examples/organizer/calendardemo/src/monthpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/todoeditpage.cpp b/examples/organizer/calendardemo/src/todoeditpage.cpp
index 7bbf72d6a..e6767781c 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.cpp
+++ b/examples/organizer/calendardemo/src/todoeditpage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/calendardemo/src/todoeditpage.h b/examples/organizer/calendardemo/src/todoeditpage.h
index 56a5f77f6..e79168043 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.h
+++ b/examples/organizer/calendardemo/src/todoeditpage.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/qmlorganizerlistview/content/EventDateTime.qml b/examples/organizer/qmlorganizerlistview/content/EventDateTime.qml
index 27b62611f..c87ec760c 100644
--- a/examples/organizer/qmlorganizerlistview/content/EventDateTime.qml
+++ b/examples/organizer/qmlorganizerlistview/content/EventDateTime.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/organizer/qmlorganizerlistview/content/EventEditor.qml b/examples/organizer/qmlorganizerlistview/content/EventEditor.qml
index 27653e540..866a13945 100644
--- a/examples/organizer/qmlorganizerlistview/content/EventEditor.qml
+++ b/examples/organizer/qmlorganizerlistview/content/EventEditor.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Organizer Module.
diff --git a/examples/organizer/qmlorganizerlistview/content/GenericButton.qml b/examples/organizer/qmlorganizerlistview/content/GenericButton.qml
index 72e3aa31c..d48276aa7 100644
--- a/examples/organizer/qmlorganizerlistview/content/GenericButton.qml
+++ b/examples/organizer/qmlorganizerlistview/content/GenericButton.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Organizer Module.
diff --git a/examples/organizer/qmlorganizerlistview/doc/src/qmlorganizerlistviewexample.qdoc b/examples/organizer/qmlorganizerlistview/doc/src/qmlorganizerlistviewexample.qdoc
index ae94c5bbf..772dfde3b 100644
--- a/examples/organizer/qmlorganizerlistview/doc/src/qmlorganizerlistviewexample.qdoc
+++ b/examples/organizer/qmlorganizerlistview/doc/src/qmlorganizerlistviewexample.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt PIM Module.
@@ -21,7 +21,6 @@
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
 ** will be met: http://www.gnu.org/copyleft/fdl.html.
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml b/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml
index 04ebb895f..ee5a9891c 100644
--- a/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml
+++ b/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Pim Module.
diff --git a/examples/organizer/todo/doc/src/todo.qdoc b/examples/organizer/todo/doc/src/todo.qdoc
index d2bcf90c2..efe5f7b79 100644
--- a/examples/organizer/todo/doc/src/todo.qdoc
+++ b/examples/organizer/todo/doc/src/todo.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt PIM Module.
@@ -21,7 +21,6 @@
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
 ** will be met: http://www.gnu.org/copyleft/fdl.html.
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/organizer/todo/main.cpp b/examples/organizer/todo/main.cpp
index bcecd1b6a..83e72c08e 100755
--- a/examples/organizer/todo/main.cpp
+++ b/examples/organizer/todo/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/todo/todoeditor.cpp b/examples/organizer/todo/todoeditor.cpp
index 88feeccbc..22a9affd6 100644
--- a/examples/organizer/todo/todoeditor.cpp
+++ b/examples/organizer/todo/todoeditor.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/todo/todoeditor.h b/examples/organizer/todo/todoeditor.h
index fe6a5879d..f6effec03 100644
--- a/examples/organizer/todo/todoeditor.h
+++ b/examples/organizer/todo/todoeditor.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/todo/window.cpp b/examples/organizer/todo/window.cpp
index cf5321fa8..bd9988043 100644
--- a/examples/organizer/todo/window.cpp
+++ b/examples/organizer/todo/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/organizer/todo/window.h b/examples/organizer/todo/window.h
index 14d325cde..ac8cf3f93 100644
--- a/examples/organizer/todo/window.h
+++ b/examples/organizer/todo/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.