summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qdesktopservices.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-20 23:16:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-20 23:16:13 (GMT)
commit6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48 (patch)
tree7d7ad331c8c5316924bd5ff3fd7e6ccb21e7cc48 /src/gui/util/qdesktopservices.cpp
parent7b4c273df2401505fe87efdf5d1d73d75993910a (diff)
parentb81201a29a9794ed490098c8eb136464afa12b8a (diff)
downloadQt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.zip
Qt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.tar.gz
Qt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits) add 4.8 changes created/merged by me Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY runonphone: Include USB serial ports on OS X for CODA, too Update changelog for Qt 4.8.0 Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name ...
Diffstat (limited to 'src/gui/util/qdesktopservices.cpp')
-rw-r--r--src/gui/util/qdesktopservices.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index e79819e..05a1292 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -177,6 +177,9 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
Unicode-aware, the user may have configured their client without these features.
Also, certain e-mail clients (e.g., Lotus Notes) have problems with long URLs.
+ \note On Symbian OS, \c SwEvent capability is required to open the given \a url
+ if the Web browser is already running.
+
\sa setUrlHandler()
*/
bool QDesktopServices::openUrl(const QUrl &url)