Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
	src/plugins/phonon/mmf/mmf.pro
	src/s60installs/s60installs.pro
	tests/auto/qapplication/test/test.pro
	tests/auto/qgraphicsview/tst_qgraphicsview.cpp

1 files changed, 4 insertions, 2 deletions

diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index 165c97c..9fa1949 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -262,7 +262,8 @@ void TextEdit::setupEditActions()
     tb->addAction(a);
     menu->addAction(a);
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
+    if (const QMimeData *md = QApplication::clipboard()->mimeData())
+        actionPaste->setEnabled(md->hasText());
 #endif
 }
 
@@ -681,7 +682,8 @@ void TextEdit::cursorPositionChanged()
 void TextEdit::clipboardDataChanged()
 {
 #ifndef QT_NO_CLIPBOARD
-    actionPaste->setEnabled(QApplication::clipboard()->mimeData()->hasText());
+    if (const QMimeData *md = QApplication::clipboard()->mimeData())
+        actionPaste->setEnabled(md->hasText());
 #endif
 }