Changeset 846 for trunk/src/gui/text/qtextcontrol_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qtextcontrol_p.h (modified) (3 diffs)

trunk/src/gui/text/qtextcontrol_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -63 +63 @@
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qtextdocumentfragment.h>
+#include <QtGui/qclipboard.h>
 
 #ifdef QT3_SUPPORT
@@ -192 +193 @@
     void cut();
     void copy();
-    void paste();
+    void paste(QClipboard::Mode mode = QClipboard::Clipboard);
 #endif