- release 3 (by relup.sh)

[packages/qt-creator.git] / qt-creator-libexec.patch

--- qt-creator-opensource-src-3.6.0/qtcreator.pri.libexec	2016-02-14 13:10:37.151868039 +0100
+++ qt-creator-opensource-src-3.6.0/qtcreator.pri	2016-02-14 13:12:02.182955481 +0100
@@ -108,7 +108,7 @@ osx {
     win32: \
         IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
     else: \
-        IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
+        IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH
     !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
 
     LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
@@ -119,7 +119,7 @@ osx {
     win32: \
         INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
     else: \
-        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
+        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
     INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
     INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
     INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
--- qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp.orig	2016-03-08 12:30:19.000000000 +0100
+++ qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp	2016-09-27 22:33:01.376312984 +0200
@@ -435,21 +435,7 @@
  */
 QString ICore::libexecPath()
 {
-    QString path;
-    switch (Utils::HostOsInfo::hostOs()) {
-    case Utils::OsTypeWindows:
-        path = QCoreApplication::applicationDirPath();
-        break;
-    case Utils::OsTypeMac:
-        path = QCoreApplication::applicationDirPath() + QLatin1String("/../Resources");
-        break;
-    case Utils::OsTypeLinux:
-    case Utils::OsTypeOtherUnix:
-    case Utils::OsTypeOther:
-        path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator");
-        break;
-    }
-    return QDir::cleanPath(path);
+    return QDir::cleanPath(QLatin1String("/usr/" IDE_LIBRARY_BASENAME "/qtcreator"));
 }
 
 static QString compilerString()