diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 16:34:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 16:34:02 (GMT) |
| commit | f14bbde351d90bed520f9503500f922f7aa18c92 (patch) | |
| tree | 86fe9e3930aa3edbc142c207891d5856921270c3 /src/gui/kernel | |
| parent | e546ecd3afd6660432178f2e9f692f8fcd16a712 (diff) | |
| parent | 9c5f08452da280a90de48d0fa3862748cc428df4 (diff) | |
| download | Qt-f14bbde351d90bed520f9503500f922f7aa18c92.zip Qt-f14bbde351d90bed520f9503500f922f7aa18c92.tar.gz Qt-f14bbde351d90bed520f9503500f922f7aa18c92.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Doc: Added a note to Code Editor example docs
Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
Doc: Added a link in Symbian Intro to Required Capabilities
Doc: Added info on ordered targets for VS to qmake manual
Doc: Small addition to the QML anchor layout docs
Doc: Internalized QDeclarativeTypeLoader
Doc: Said that QIODevice::isSequential returns false by default
Doc: Said that QList::clear deallocates memory
Doc: Updated platform notes for MultiMedia and Phonon
Doc: Added links to the plugin deployment guide.
Doc: Fix doc bug in QMouseEvent
Doc: Fixed doc bug in QMetaObject
Doc: Fixed date format doc bug in QDateTime/Qt namespace
Doc: Removed internal Phonon classes from doce
qdoc3: Updates for QTBUG-20776; include fileToOpen path.
qdoc3: Updates for QTBUG-20776; clear map between runs.
qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
qdoc3: Updates for QTBUG-20776 and QTBUG-20777
qdoc: Check pointer for null before dereferencing.
...
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index de2d87e..e1df267 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -142,8 +142,7 @@ QInputEvent::~QInputEvent() and QWidget::mouseMoveEvent() to receive mouse events in your own widgets. - \sa QWidget::setMouseTracking() QWidget::grabMouse() - QCursor::pos() + \sa QWidget::setMouseTracking() QWidget::grabMouse() QCursor::pos() */ /*! |