AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More changes from Nokia to Digia

Browse Source 
Change-Id: I8f2edd238e64c01d3ccb7c012b389d61435d7135
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sergio Ahumada 2012-11-28 22:13:34 +01:00 committed by The Qt Project
parent e2be953386
commit 33a8455042
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp
View File

@ -128,7 +128,7 @@ while (pos >= 0) {
//! [10] //! [10]
str = "Nokia Corporation\tqt.nokia.com\tNorway"; str = "Digia Plc\tqt.digia.com\tFinland";
QString company, web, country; QString company, web, country;
rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$"); rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$");
if (rx.indexIn(str) != -1) { if (rx.indexIn(str) != -1) {

4
src/tools/qdoc/doc/config/qt-html-templates-online.qdocconf
View File

@ -63,7 +63,7 @@ HTML.footer = \
" </div> \n" \ " </div> \n" \
" <div class=\"footer\">\n" \ " <div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \ " their respective owners.</p>\n" \
" <br />\n" \ " <br />\n" \
@ -76,7 +76,7 @@ HTML.footer = \
" www.qt-project.org</a>.</p>\n" \ " www.qt-project.org</a>.</p>\n" \
" <br />\n" \ " <br />\n" \
" <p>\n" \ " <p>\n" \
" Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

4
src/tools/qdoc/doc/config/qt-html-templates.qdocconf
View File

@ -23,7 +23,7 @@ HTML.footer = \
"</div> \n" \ "</div> \n" \
"<div class=\"footer\">\n" \ "<div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \ " their respective owners.</p>\n" \
" <br />\n" \ " <br />\n" \
@ -36,7 +36,7 @@ HTML.footer = \
" www.qt-project.org</a>.</p>\n" \ " www.qt-project.org</a>.</p>\n" \
" <br />\n" \ " <br />\n" \
" <p>\n" \ " <p>\n" \
" Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

4
util/lexgen/generator.cpp
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/ ** Contact: http://www.qt-project.org/legal
** **
** This file is part of the utils of the Qt Toolkit. ** This file is part of the utils of the Qt Toolkit.
** **

4
util/lexgen/generator.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/ ** Contact: http://www.qt-project.org/legal
** **
** This file is part of the utils of the Qt Toolkit. ** This file is part of the utils of the Qt Toolkit.
** **