From 01a389d806d5e72714c9a6e91cb68e3669ff2994 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 29 Jan 2015 11:36:08 +0100 Subject: Doc: Updated copyright license holder in documentation footer Also updated 'Privacy Policy' URL. Change-Id: I65d8a49ef35397445b7bf27b245799a20f7fcf54 Reviewed-by: Eirik Aavitsland --- src/doc/config/html-offline.qdocconf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 997bf42..142ec46 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -12,16 +12,15 @@ HTML.footer = \ " \n" \ "
\n" \ "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries.

\n" \ + " © 2015 The Qt Company.

\n" \ "

\n" \ " Licensees holding valid Qt Commercial licenses may use this document in\n" \ " accordance with the Qt Commercial License Agreement provided with the\n" \ " Software or, alternatively, in accordance with the terms contained in a\n" \ - " written agreement between you and Digia.<\p>\n" \ + " written agreement between you and The Qt Company.<\p>\n" \ "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. Privacy Policy

\n" \ + " href=\"http://www.qt.io/terms-conditions/#section-3\">Privacy Policy

\n" \ "
\n" -- cgit v1.2.3