diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
commit | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (patch) | |
tree | ae1d621e9933d88e22f03e28dfea671a3a272ab1 /src/gui/util/qdesktopservices.cpp | |
parent | 4e5a1a77677540422cc69ec5c2b1341ca4b318f9 (diff) | |
parent | 05eeb454e0fcc83db330ee7df33a800a6998fc30 (diff) | |
download | Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.zip Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.gz Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/util/qdesktopservices.cpp')
-rw-r--r-- | src/gui/util/qdesktopservices.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index 1690d87..85b539f 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -294,15 +294,6 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) Rest of the standard locations point to folder on same drive with executable, except that if executable is in ROM the folder from C drive is returned. - \note On Mac OS X, DataLocation does not include QCoreApplication::organizationName. - Use code like this to add it: - - \code - QString location = QDesktopServices::storageLocation(QDesktopServices::DataLocation); - #ifdef Q_WS_MAC - location.insert(location.count() - QCoreApplication::applicationName().count(), - QCoreApplication::organizationName() + "/"); - #endif \endcode */ |