Changeset 846 for trunk/demos/textedit/textedit.cpp

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)
• demos/textedit/textedit.cpp (modified) (3 diffs)

trunk/demos/textedit/textedit.cpp

@@ -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)
@@ -263 +263 @@
     menu->addAction(a);
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    if (const QMimeData *md = QApplication::clipboard()->mimeData())
+        actionPaste->setEnabled(md->hasText());
 #endif
 }
@@ -682 +683 @@
 {
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    if (const QMimeData *md = QApplication::clipboard()->mimeData())
+        actionPaste->setEnabled(md->hasText());
 #endif
 }