summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qevent.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-12-16 16:59:27 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-12-16 16:59:27 (GMT)
commitf763f0089e0acb114524a6276c2ed7ff823d1d05 (patch)
treee1d825f0a5f5429b27d153861f91b33dc4e4a6fc /src/gui/kernel/qevent.cpp
parent2a2dec6666f8f38e9240784b423ce69b18e1064e (diff)
parentcbe70d58bc1667b2e09f78a5d4427e7d071a2354 (diff)
downloadQt-f763f0089e0acb114524a6276c2ed7ff823d1d05.zip
Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.gz
Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
-rw-r--r--src/gui/kernel/qevent.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 3579c79..eedf0a7 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -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
{