diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:14 +0100 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2015-02-26 15:41:14 +0100 |
| commit | cb624a5a62b35cc744578f31a59c280e00e2479b (patch) | |
| tree | 0b0aad4d3478f9233befc1dad1c76446e9054c78 /src | |
| parent | f3600905f9b3d905568dd7494a18e69f9d255fd3 (diff) | |
Tizen: Fix QCoreApplication::applicationDirPath()
Disable the code path which queries /proc/<pid>/exe for the
current executable path, as from a Q_OS_LINUX_TIZEN perspective,
this executable will be the launch_app binary. Instead we
get the application directory via the fallback, by
looking in argv[0], since this is set to the location of the
application binary.
Change-Id: I3132266b8fa83cfad968e5d04883d88a731c1a87
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 6b0ebf8b8b..f0dc2ba2a8 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2076,7 +2076,7 @@ QString QCoreApplication::applicationFilePath() } #endif #if defined( Q_OS_UNIX ) -# if defined(Q_OS_LINUX) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)) +# if defined(Q_OS_LINUX) && ((!defined(Q_OS_ANDROID) && !defined(Q_OS_LINUX_TIZEN)) || defined(Q_OS_ANDROID_NO_SDK)) // Try looking for a /proc/<pid>/exe symlink first which points to // the absolute path of the executable QFileInfo pfi(QString::fromLatin1("/proc/%1/exe").arg(getpid())); |