summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/api/qxmlname.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
commit04e3b306115b1a4631032e3ce5b79cc78145365b (patch)
treec7bf7f282d4dcfe11fbdd0a7c5de686d2c4f36ab /src/xmlpatterns/api/qxmlname.cpp
parent9fc309a822490ba93c4c7a1fa1221b288e145a3d (diff)
downloadQt-04e3b306115b1a4631032e3ce5b79cc78145365b.zip
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.gz
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.bz2
Update license headers again.
Reviewed-by: Trust Me
Diffstat (limited to 'src/xmlpatterns/api/qxmlname.cpp')
-rw-r--r--src/xmlpatterns/api/qxmlname.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xmlpatterns/api/qxmlname.cpp b/src/xmlpatterns/api/qxmlname.cpp
index 8e89239..9e30fa6 100644
--- a/src/xmlpatterns/api/qxmlname.cpp
+++ b/src/xmlpatterns/api/qxmlname.cpp
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtXmlPatterns module of the Qt Toolkit.
@@ -20,10 +21,9 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
class='column5'>| | | | | | | Help: new section on conditional generator expressionsJoachim Wuttke (h)2018-11-061-8/+15 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the closely related signatures $<condition:true_value> $<IF:condition,true_value,false_value> were explained in two different sections. The former section was badly explained, with '0' and '1' in place of the formal parameter 'condition'. | * | | | | | | | | | | | | | | | Help: rm unmotivated "This means that"Joachim Wuttke (h)2018-11-061-4/+4 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That generator expressions enable conditional things has not been said before. Amended for nicer source format. | * | | | | | | | | | | | | | | | Help: expand "ver", "pol", ...Joachim Wuttke (h)2018-11-061-19/+23 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to save a few characters on formal parameters. Use this occasion to correct $<PLATFORM_ID:comp>: the parameter is a platform_id, not a compiler_id. | * | | | | | | | | | | | | | | | Help: expand "..." and "?" in logical generator expressionsJoachim Wuttke (h)2018-11-061-13/+20 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand "..." and "?", which could be mistaken as metacharacters (and in the explanations of AND and OR actually were meant as metacharacters). * | | | | | | | | | | | | | | | | Merge topic 'FindSQLite3-module'Brad King2018-11-078-0/+112 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe40570608 FindSQLite3: Add module to find SQLite3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2557 | * | | | | | | | | | | | | | | | | FindSQLite3: Add module to find SQLite3Chuck Atkins2018-11-068-0/+112 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-11-071-1/+1 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | Merge topic 'xref2'Brad King2018-11-061-0/+3 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a98a0af46 Help: Link to cmake.org "Get Involved" page from cmake-developer(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2537 | * | | | | | | | | | | | | | | | | | Help: Link to cmake.org "Get Involved" page from cmake-developer(7)Joachim Wuttke (h)2018-11-061-0/+3 | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | Merge branch 'release-3.13'Brad King2018-11-060-0/+0 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | Merge branch 'cpack-doc-gen-names' into release-3.13Brad King2018-11-0616-59/+59 | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2563 * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'cpack-doc-gen-names'Brad King2018-11-0616-59/+59 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12deb051b3 Help: Use correct CPack generator names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2563 | * | | | | | | | | | | | | | | | | Help: Use correct CPack generator namesCraig Scott2018-11-0616-59/+59 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack generator names were not used consistently throughout the documentation, resulting in ambiguity about what the correct name was for use with the `cpack -G` option. With the changes in this commit, the cpack-generators(7) page of the manual now shows the correct names and other help pages no longer use inconsistent or incorrect names. * | | | | | | | | | | | | | | | | | Merge topic 'FindPostgreSQL-target'Brad King2018-11-066-11/+101 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 575e2cc35d FindPostgreSQL: extract the actual version number 7413f29fe6 Tests/FindPostgreSQL: add a test for FindPostgreSQL d2235fd253 FindPostgreSQL: add an imported target 7a801b7dfb FindPostgreSQL: Modernize documentation layout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2555 | * | | | | | | | | | | | | | | | | | FindPostgreSQL: extract the actual version numberBen Boeckel2018-11-05