diff options
author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-20 11:23:30 (GMT) |
---|---|---|
committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-20 11:23:30 (GMT) |
commit | 7bd98800a9e5dd4470cb1230e78493262a26dde8 (patch) | |
tree | 9be29fd48c2f8cb11f705aefb7bb8553f54fd2b7 /src/gui/image/qpixmap_s60.cpp | |
parent | 3f76d68d9573b81fa85c5286e2826bdadd0c9e77 (diff) | |
parent | 8fe90a6651f2370d1a669fc2d543ad0d64c5ba7e (diff) | |
download | Qt-7bd98800a9e5dd4470cb1230e78493262a26dde8.zip Qt-7bd98800a9e5dd4470cb1230e78493262a26dde8.tar.gz Qt-7bd98800a9e5dd4470cb1230e78493262a26dde8.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/image/qpixmap_s60.cpp')
-rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index ab19924..a796066 100644 --- a/src/gui/image/qpixmap_s60.cpp +++ b/src/gui/image/qpixmap_s60.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |