summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-04-28 01:50:42 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-04-28 01:50:42 (GMT)
commit3eded761167af317bab4f4d8c1ac0a12433eb03a (patch)
tree7648db3521275ee62a1bea47ba3693570250b258 /src/gui
parentf021a26114f599baf01db9bbe8dee5c2dece044e (diff)
downloadQt-3eded761167af317bab4f4d8c1ac0a12433eb03a.zip
Qt-3eded761167af317bab4f4d8c1ac0a12433eb03a.tar.gz
Qt-3eded761167af317bab4f4d8c1ac0a12433eb03a.tar.bz2
A small mistake when comparing the flag.
Qt::NoTextInteraction is equal to 0 so you can't compare using & because it will always be false even if the flag is set. Reviewed-by:janarve
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qtextcontrol.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 3c596e5..a2ee659 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -885,8 +885,10 @@ void QTextControl::processEvent(QEvent *e, const QPointF &coordinateOffset, QWid
void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget)
{
Q_D(QTextControl);
- if (d->interactionFlags & Qt::NoTextInteraction)
+ if (d->interactionFlags == Qt::NoTextInteraction) {
+ e->ignore();
return;
+ }
d->contextWidget = contextWidget;