summaryrefslogtreecommitdiffstats
path: root/src/activeqt/container/qaxwidget.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-09-16 08:22:48 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-09-16 08:22:48 (GMT)
commit78f0dd0f00506139eab54e7dc50f8980df78da63 (patch)
tree9ec0f0256618446f4dd08be34eceb51852984074 /src/activeqt/container/qaxwidget.cpp
parent5d35dbc3552f722cf4de220d8737e8201e4f61e5 (diff)
parent30377d51a8568b9b778b58a63fb036e35a879124 (diff)
downloadQt-78f0dd0f00506139eab54e7dc50f8980df78da63.zip
Qt-78f0dd0f00506139eab54e7dc50f8980df78da63.tar.gz
Qt-78f0dd0f00506139eab54e7dc50f8980df78da63.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/activeqt/container/qaxwidget.cpp')
-rw-r--r--src/activeqt/container/qaxwidget.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 94f85a5..03d9488 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.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 ActiveQt framework of the Qt Toolkit.