diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
| commit | 5ff97be22a5246c11851c2c6471a0b7ee2399425 (patch) | |
| tree | 4318dec329f4b3401184c9df80272c09e242bec3 /src/gui/util/qdesktopservices.cpp | |
| parent | 0009fa533e4d5ca1a75ba3b56af082cdcfee55cc (diff) | |
| parent | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (diff) | |
| download | Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.zip Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.tar.gz Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.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 */ |