summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-20 07:18:44 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-29 16:00:10 (GMT)
commitf56f27e2cfd5880dfa8435f7648b080e02c8ee99 (patch)
tree829fb9cc70a10f991471e1cbbd04866cf80287f8 /src/gui
parentcbef10e1781cdef5ec6dcf0bdeea6506258ee431 (diff)
downloadQt-f56f27e2cfd5880dfa8435f7648b080e02c8ee99.zip
Qt-f56f27e2cfd5880dfa8435f7648b080e02c8ee99.tar.gz
Qt-f56f27e2cfd5880dfa8435f7648b080e02c8ee99.tar.bz2
Fix QT_NO_GROUPBOX
Reviewed-by: tom
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qplaintextedit.cpp2
-rw-r--r--src/gui/widgets/qtextedit.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index fc61889..bb93546 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -1599,7 +1599,6 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
return;
}
}
-#endif // QT_NO_SHORTCUT
if (!(tif & Qt::TextEditable)) {
switch (e->key()) {
@@ -1627,6 +1626,7 @@ void QPlainTextEdit::keyPressEvent(QKeyEvent *e)
}
return;
}
+#endif // QT_NO_SHORTCUT
d->sendControlEvent(e);
#ifdef QT_KEYPAD_NAVIGATION
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index f477fee..d995e0f 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -1246,7 +1246,6 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
return;
}
}
-#endif // QT_NO_SHORTCUT
if (!(tif & Qt::TextEditable)) {
switch (e->key()) {
@@ -1274,6 +1273,7 @@ void QTextEdit::keyPressEvent(QKeyEvent *e)
}
return;
}
+#endif // QT_NO_SHORTCUT
{
QTextCursor cursor = d->control->textCursor();