diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 14:02:41 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-04 14:02:41 +0100 |
| commit | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (patch) | |
| tree | 74009d7bd395e7bd39076875914c5f1353a30902 /dist | |
| parent | 3c3db55c205012de15bab758b3bb4857d132cb98 (diff) | |
| parent | 51c9b68425c1d3fe64a08e6ef0357fbd6bdd8f8a (diff) | |
Merge commit '51c9b68' into 4.6
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.0 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 index 01b3c58a56..61c3aa07c4 100644 --- a/dist/changes-4.6.0 +++ b/dist/changes-4.6.0 @@ -232,4 +232,8 @@ information about a particular change. for all floating point numbers, and this can be changed using the new function setFloatingPointPrecision(). Set Qt_4_5 as the version of the QDataStream to get the behavior of previous versions. - + + - On Mac OS X, QDesktopServices::storageLocation(DataLocation) now includes + QCoreApplication::organizationName() and QCoreApplication::applicationName() + if those are set. This matches the behavior on the other platforms. + |