Changeset 769 for trunk/tools/designer/src/plugins/activeqt

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h (modified) (1 diff)
• tools/designer/src/plugins/activeqt/qdesigneraxwidget.h (modified) (1 diff)

trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h

@@ -78 +78 @@
     Q_OBJECT
 public:
-    QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
+    explicit QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
 
 protected:

trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h

@@ -106 +106 @@
 class QDesignerAxPluginWidget : public QDesignerAxWidget
 {
-   // No Q_OBJECT here! - meta functionality is overriden
+   // No Q_OBJECT here! - meta functionality is overridden
 public:
     explicit QDesignerAxPluginWidget(QWidget *parent);