From bae9ef96b7e4396adead35a5e540fe4963326368 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 20 Dec 2012 21:45:57 +0100 Subject: Change copyright from Nokia to Digia Change-Id: Ie75877290e0bce06c8b5a24ed664e8aceaf2cac0 Reviewed-by: Andy Shaw Reviewed-by: Sergio Ahumada --- .../html/qtsingleapplication-example-loader.html | 8 ++--- .../html/qtsingleapplication-example-trivial.html | 8 ++--- .../qtsinglecoreapplication-example-console.html | 8 ++--- qtsingleapplication/doc/index.qdoc | 42 +++++++++++++++++++++- 4 files changed, 50 insertions(+), 16 deletions(-) (limited to 'qtsingleapplication/doc') diff --git a/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html b/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html index c305ae5..4a62ba0 100644 --- a/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html +++ b/qtsingleapplication/doc/html/qtsingleapplication-example-loader.html @@ -17,12 +17,10 @@

The application in this example loads or prints the documents passed as commandline parameters to further instances of this application.

 /****************************************************************************
  **
- ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- ** All rights reserved.
+ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
  **
- ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of a Qt Solutions component.
+ ** This file is part of the Qt Solutions component.
  **
  ** You may use this file under the terms of the BSD license as follows:
  **
diff --git a/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html b/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html
index b3a1910..61c9f92 100644
--- a/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html
+++ b/qtsingleapplication/doc/html/qtsingleapplication-example-trivial.html
@@ -18,12 +18,10 @@
 
The example demonstrates the use of the QtSingleApplication class to detect and communicate with a running instance of the application using the sendMessage() API. The messageReceived() signal is used to display received messages in a QTextEdit log.

 
 /****************************************************************************
  **
- ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- ** All rights reserved.
+ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
  **
- ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of a Qt Solutions component.
+ ** This file is part of the Qt Solutions component.
  **
  ** You may use this file under the terms of the BSD license as follows:
  **
diff --git a/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html b/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html
index 5c4f642..63343a4 100644
--- a/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html
+++ b/qtsingleapplication/doc/html/qtsinglecoreapplication-example-console.html
@@ -28,12 +28,10 @@
 
main.cpp:

 
 /****************************************************************************
  **
- ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- ** All rights reserved.
+ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
  **
- ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of a Qt Solutions component.
+ ** This file is part of the Qt Solutions component.
  **
  ** You may use this file under the terms of the BSD license as follows:
  **
diff --git a/qtsingleapplication/doc/index.qdoc b/qtsingleapplication/doc/index.qdoc
index 9c3308d..2dce56b 100644
--- a/qtsingleapplication/doc/index.qdoc
+++ b/qtsingleapplication/doc/index.qdoc
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Solutions component.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 /*!
 	\page index.html
 	\title Single Application
@@ -44,4 +84,4 @@
     	
 
 	
-	*/
\ No newline at end of file
+*/
-- 
cgit v1.2.3