summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qdesktopservices.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-29 10:17:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-29 11:33:35 +0100
commit3eb588078e7f4d62053584a70f7600b19ec99a0f (patch)
tree432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/gui/util/qdesktopservices.cpp
parent7b8ab4204417844e72bb66696227a422f4ef3e2d (diff)
parent02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/util/qdesktopservices.cpp')
-rw-r--r--src/gui/util/qdesktopservices.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 61f9393dfb..97847af8ea 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -143,7 +143,10 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
same argument, and it will try to open the URL using the
appropriate mechanism for the user's desktop environment.
- \sa QSystemTrayIcon, QProcess
+ \note Since Qt 5, storageLocation() and displayName() are replaced by functionality
+ provided by the QStandardPaths class.
+
+ \sa QSystemTrayIcon, QProcess, QStandardPaths
*/
/*!