Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
  Fixed a buffer overrun when pasting large data from non-Qt apps
  Fix copying large data to non-Qt applications
  fix regexp in "make custom command handling in vc(x)proj files sane"
  qmake: Include -pthread when reducing duplicate library arguments
  qmake: Ensure right library order when reducing duplicate libraries
  rebuild configure.exe
  make QMAKE_POST_LINK handling in nmake generator sane
  make custom command handling in vc(x)proj files sane
  Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
  QtScript/JavaScriptCore: Backport random number generator seeding fix
  Fix performance regression in QUuid::createUuid()
  Update japanese translations.
  Ensure that the underline is only drawn when expected for an accel
  Small improvement in the textedit demo
  My changes for 4.7.1
  QWorkspace: fix hardcoded min size overwriting the real min size
  Doc: Fixing link titles and error color in search results
  Doc: Implementing features to the search feature.
  Setting the _NET_WM_STATE Atom only when its not already set
  Fix focus appearance of tabwidget tabs with QGtkStyle
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index e1f24a1..165c97c 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -262,7 +262,7 @@ void TextEdit::setupEditActions()
     tb->addAction(a);
     menu->addAction(a);
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
 #endif
 }
 
@@ -681,7 +681,7 @@ void TextEdit::cursorPositionChanged()
 void TextEdit::clipboardDataChanged()
 {
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(!QApplication::clipboard()->text().isEmpty());
+    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
 #endif
 }