diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 13:02:41 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 13:02:41 (GMT) |
| commit | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (patch) | |
| tree | 74009d7bd395e7bd39076875914c5f1353a30902 /src/gui/util/qdesktopservices.cpp | |
| parent | 3c3db55c205012de15bab758b3bb4857d132cb98 (diff) | |
| parent | 51c9b68425c1d3fe64a08e6ef0357fbd6bdd8f8a (diff) | |
| download | Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.zip Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.gz Qt-94b595f37b3a49d44d1a795e5f2b003ac921d4b7.tar.bz2 | |
Merge commit '51c9b68' into 4.6
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
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 */ |