From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Wed, 17 Oct 2012 08:45:43 +0000 (+0200)
Subject: Blackberry: Fix applicationFilePath() for unpackaged executables
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e2133247677fbdf81741badf523a00612826a37;p=profile%2Fivi%2Fqtbase.git

Blackberry: Fix applicationFilePath() for unpackaged executables

Not all executables originate from a BAR package, for example unit
tests.
Make those use the fallback code for finding the application file path.

Change-Id: I5603f329bbe74e37d319ddd190f72bc6f64e1a5c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index df0ffce..55112af 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1796,8 +1796,6 @@ QString QCoreApplication::applicationFilePath()
     if (!executables.empty()) {
         //We assume that there is only one executable in the folder
         return dir.absoluteFilePath(executables.first());
-    } else {
-        return QString();
     }
 #elif defined(Q_OS_MAC)
     QString qAppFileName_str = qAppFileName();