diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:13:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:13:15 (GMT) |
| commit | 398d37e78d0026b832e1676de9bd33b5441bfd9e (patch) | |
| tree | 69cfa40370d5b837ac310a463f898471fa949f3a /src/gui/text/qtextcontrol_p.h | |
| parent | bfe06c2531fa47d4d417ec22bdb184b06ad0f073 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
| download | Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.zip Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.gz Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
Diffstat (limited to 'src/gui/text/qtextcontrol_p.h')
| -rw-r--r-- | src/gui/text/qtextcontrol_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h index 263af31..bc8e063 100644 --- a/src/gui/text/qtextcontrol_p.h +++ b/src/gui/text/qtextcontrol_p.h @@ -95,6 +95,7 @@ class Q_GUI_EXPORT QTextControl : public QObject Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) Q_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) + Q_PROPERTY(bool ignoreUnusedNavigationEvents READ ignoreUnusedNavigationEvents WRITE setIgnoreUnusedNavigationEvents) public: explicit QTextControl(QObject *parent = 0); explicit QTextControl(const QString &text, QObject *parent = 0); @@ -163,6 +164,9 @@ public: void setOpenExternalLinks(bool open); bool openExternalLinks() const; + void setIgnoreUnusedNavigationEvents(bool ignore); + bool ignoreUnusedNavigationEvents() const; + void moveCursor(QTextCursor::MoveOperation op, QTextCursor::MoveMode mode = QTextCursor::MoveAnchor); bool canPaste() const; |