summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjutaipal <juhani.taipale@digia.com>2012-12-11 01:14:14 -0800
committerjutaipal <juhani.taipale@digia.com>2012-12-11 01:14:14 -0800
commit9dee1347bf81f4d56b7ace8feeaf9fde9f7b85d9 (patch)
tree1f751e9c27fe024a9c78ddf25fce7d2b83faacb0
parentf987a8dd52055b7d1090ec714b57b6e4acbf9c40 (diff)
downloadqt4-tools-9dee1347bf81f4d56b7ace8feeaf9fde9f7b85d9.tar.gz
Changing licensing contact info from nokia to digia
-rw-r--r--doc/src/qt-webpages.qdoc4
-rw-r--r--tools/doxygen/config/phonon.doxyfile2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 9e0bc8d39e..bfe6b0321b 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -136,12 +136,12 @@
*/
/*!
- \externalpage http://qt.nokia.com/products/licensing/
+ \externalpage http://qt.digia.com/product/licensing/
\title Free Software and Contributions
*/
/*!
- \externalpage http://qt.nokia.com/products/licensing/
+ \externalpage http://qt.digia.com/product/licensing/
\title Qt Licensing Overview
*/
diff --git a/tools/doxygen/config/phonon.doxyfile b/tools/doxygen/config/phonon.doxyfile
index a43007ddee..9bf666520f 100644
--- a/tools/doxygen/config/phonon.doxyfile
+++ b/tools/doxygen/config/phonon.doxyfile
@@ -216,5 +216,5 @@ ALIASES = \
"x11=<a href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3\">X11</a>" \
"gpl=<a href=\"http://www.fsf.org/licensing/licenses/gpl.html#SEC1\">GPL</a>" \
"lgpl=<a href=\"http://www.fsf.org/licensing/licenses/lgpl.html#SEC1\">LGPL</a>" \
- "qpl=<a href=\"http://qt.nokia.com/products/licensing\">QPL</a>"
+ "qpl=<a href=\"http://qt.digia.com/product/licensing\">QPL</a>"