[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/akonadi/libs
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2010-08-17 14:04:33
Message-ID: 20100817140433.969A7AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164700 by krake:

If we have a QCoreApplication instance, add the current programs application path to \
the search list for executables if it is not in the list yet. Helps on Windows when \
tool programs are installed together but into a location which is not in PATH


 M  +8 -0      xdgbasedirs.cpp  


--- trunk/kdesupport/akonadi/libs/xdgbasedirs.cpp #1164699:1164700
@@ -21,6 +21,7 @@
 
 #include "akonadi-prefix.h" // for prefix defines
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
@@ -196,6 +197,13 @@
       executableDirs << prefixExecutableDir;
     }
 
+    if ( QCoreApplication::instance() != 0 ) {
+        const QString appExecutableDir = \
QCoreApplication::instance()->applicationDirPath(); +        if ( \
!executableDirs.contains( appExecutableDir ) ) { +          executableDirs << \
appExecutableDir; +        }
+    }
+
     executableDirs += searchPath;
 
 #if defined(Q_OS_MAC) //krazy:exclude=cpp


[prev in list] [next in list] [prev in thread] [next in thread]