diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
| commit | 350b0fadf3fbd12a278681513295577a066b0fb1 (patch) | |
| tree | f0ebad6693c3cf3b7754fb8187a6b320e5d4679f /src/gui/kernel/qevent.cpp | |
| parent | e4625e53aa893f7c59407913e743951294c7dafe (diff) | |
| parent | 9d636095403f5abecbdff8ffffe658f35ff10001 (diff) | |
| download | Qt-350b0fadf3fbd12a278681513295577a066b0fb1.zip Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.gz Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.bz2 | |
Merge commit 'origin/4.6' into bearermanagement/integration-4
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index c4a25e1..acf7184 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -409,7 +409,7 @@ QMouseEventEx::~QMouseEventEx() consider a top-level window A containing a child B which in turn contains a child C (all with mouse tracking enabled): - \image hoverEvents.png + \image hoverevents.png Now, if you move the cursor from the top to the bottom in the middle of A, you will get the following QEvent::MouseMove events: @@ -432,7 +432,7 @@ QMouseEventEx::~QMouseEventEx() \o A::HoverMove, B::HoverMove \o A::HoverMove, B::HoverMove, C::HoverMove \endlist - + */ /*! @@ -3023,7 +3023,7 @@ QShowEvent::~QShowEvent() This event is only used to notify the application of a request. It may be safely ignored. - \note This class is currently supported for Mac Os X only. + \note This class is currently supported for Mac OS X only. */ /*! @@ -3066,6 +3066,8 @@ QFileOpenEvent::~QFileOpenEvent() \fn QUrl QFileOpenEvent::url() const Returns the url that is being opened. + + \since 4.6 */ QUrl QFileOpenEvent::url() const { |