diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 16:50:23 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 16:50:23 (GMT) |
| commit | e8b116e793d13204fb00b286becf95d2a933a784 (patch) | |
| tree | 7d94b673694d5c9e7475faeae35f1268e518cca8 /doc/src/platforms | |
| parent | 42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0 (diff) | |
| parent | a214bb99775e898fd9233b932f08ff91a57fc053 (diff) | |
| download | Qt-e8b116e793d13204fb00b286becf95d2a933a784.zip Qt-e8b116e793d13204fb00b286becf95d2a933a784.tar.gz Qt-e8b116e793d13204fb00b286becf95d2a933a784.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'doc/src/platforms')
| -rw-r--r-- | doc/src/platforms/mac-differences.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/platforms/mac-differences.qdoc b/doc/src/platforms/mac-differences.qdoc index 766c619..2501656 100644 --- a/doc/src/platforms/mac-differences.qdoc +++ b/doc/src/platforms/mac-differences.qdoc @@ -175,6 +175,9 @@ \l{http://developer.apple.com/documentation/CoreFoundation/Reference/CFBundleRef/index.html} {Apple's Developer Website}. + Note: QCoreApplication::applicationDirPath() can be used to determine + the path of the binary within the bundle. + \section2 Translating the Application Menu and Native Dialogs The items in the Application Menu will be merged correctly for |