diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
| commit | 00fcb5e473e93546f999e45c78ed940b4d4caeeb (patch) | |
| tree | b84b34de6446e5a5f191fa5a501c63f7106d168a /demos | |
| parent | 3fe6eab1e6e451457b9c060b6b643b86d3f82557 (diff) | |
| parent | 95b0418a7ee7aee9658fd19b363e73d583af0b04 (diff) | |
| download | Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.zip Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.gz Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 2 | ||||
| -rw-r--r-- | demos/textedit/textedit.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 8a7fdc5..5929ecf 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -18,6 +18,6 @@ symbian:{ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) qmlminehuntfiles.sources = MinehuntCore minehunt.qml - DEPLOYMENT = qmlminehuntfiles + DEPLOYMENT += qmlminehuntfiles } 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 } |