diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2013-09-20 19:48:51 +0200 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2014-10-04 17:36:21 +0200 |
| commit | 145a1708db30262bf49279321a183a80ee6b52df (patch) | |
| tree | 622b55b78f3ea10668f3389f88f48899cf0beddf | |
| parent | 238cbda93a9f279f9828c69bb9fdb893bda5705a (diff) | |
| download | qtbase-145a1708db30262bf49279321a183a80ee6b52df.tar.gz qtbase-145a1708db30262bf49279321a183a80ee6b52df.tar.bz2 qtbase-145a1708db30262bf49279321a183a80ee6b52df.zip | |
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>
| -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 45647f2056..7d437f8b9b 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2060,7 +2060,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())); |