summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenudata.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-06-19 04:36:47 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-06-19 04:36:47 (GMT)
commitfbf9db1fc6b500bfe05fdfca121986687d73d5c6 (patch)
tree0ab6e8834aa4cf7068df121d7f2a1f290b8a2726 /src/gui/widgets/qmenudata.h
parent4383d5a9dae96bb87f824088d1b565a2fad09b18 (diff)
parent7d8cd9b7c2f857b9e065d9eebd169d2299dcf35b (diff)
downloadQt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.zip
Qt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.tar.gz
Qt-fbf9db1fc6b500bfe05fdfca121986687d73d5c6.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qmenudata.h')
-rw-r--r--src/gui/widgets/qmenudata.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenudata.h b/src/gui/widgets/qmenudata.h
index 24d960a..7d0228f 100644
--- a/src/gui/widgets/qmenudata.h
+++ b/src/gui/widgets/qmenudata.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$
**
****************************************************************************/