diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-21 23:16:08 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-21 23:16:08 (GMT) |
| commit | 511d86e88b33380116f27d5f6a2a0754e8f62fa0 (patch) | |
| tree | 6fdcb11b5270984112bc2563738c24d2891595d4 /src/gui/embedded/qscreenproxy_qws.h | |
| parent | aae3c899b10bee2dd64bb00bb2832620a47cff87 (diff) | |
| parent | fbf9db1fc6b500bfe05fdfca121986687d73d5c6 (diff) | |
| download | Qt-511d86e88b33380116f27d5f6a2a0754e8f62fa0.zip Qt-511d86e88b33380116f27d5f6a2a0754e8f62fa0.tar.gz Qt-511d86e88b33380116f27d5f6a2a0754e8f62fa0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/embedded/qscreenproxy_qws.h')
| -rw-r--r-- | src/gui/embedded/qscreenproxy_qws.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/embedded/qscreenproxy_qws.h b/src/gui/embedded/qscreenproxy_qws.h index 6373c2a..c05f549 100644 --- a/src/gui/embedded/qscreenproxy_qws.h +++ b/src/gui/embedded/qscreenproxy_qws.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -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 qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |