Changeset 561 for trunk/src/activeqt/container/qaxobject.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/container/qaxobject.cpp (modified) (6 diffs)

trunk/src/activeqt/container/qaxobject.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
 #include "qaxobject.h"
 
@@ -127 +124 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxObject::metaObject() const
@@ -135 +132 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxObject::parentMetaObject() const
@@ -153 +150 @@
 
 /*!
-    \reimp
+    \internal
 */
 const char *QAxObject::className() const
@@ -161 +158 @@
 
 /*!
-    \reimp
+    \internal
 */
 int QAxObject::qt_metacall(QMetaObject::Call call, int id, void **v)