diff options
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 419403d938..46e7334e37 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -90,6 +90,10 @@ #include <QtGui/QClipboard> #endif +#ifdef Q_OS_MAC +# include "private/qcore_mac_p.h" +#endif + QT_BEGIN_NAMESPACE Q_GUI_EXPORT bool qt_is_gui_used = true; @@ -868,7 +872,15 @@ void QGuiApplicationPrivate::init() QGuiApplication::setLayoutDirection(Qt::RightToLeft); #ifdef Q_OS_MAC } else if (arg.startsWith("-psn_")) { - // eat "-psn_xxxx" on Mac + // eat "-psn_xxxx" on Mac, which is passed when starting an app from Finder. + // special hack to change working directory (for an app bundle) when running from finder + if (QDir::currentPath() == QLatin1String("/")) { + QCFType<CFURLRef> bundleURL(CFBundleCopyBundleURL(CFBundleGetMainBundle())); + QString qbundlePath = QCFString(CFURLCopyFileSystemPath(bundleURL, + kCFURLPOSIXPathStyle)); + if (qbundlePath.endsWith(QLatin1String(".app"))) + QDir::setCurrent(qbundlePath.section(QLatin1Char('/'), 0, -2)); + } #endif } else { argv[j++] = argv[i]; |