9 files changed, 31 insertions, 12 deletions
diff --git a/qtcreator.pri b/qtcreator.pri
index 1e0a984a1d..f68fa435d5 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -88,10 +88,13 @@ macx {
     IDE_APP_TARGET   = qtcreator
     IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
-    IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
     IDE_DATA_PATH    = $$IDE_BUILD_TREE/share/qtcreator
     IDE_DOC_PATH     = $$IDE_BUILD_TREE/share/doc/qtcreator
     IDE_BIN_PATH     = $$IDE_APP_PATH
+    win32: \
+        IDE_LIBEXEC_PATH = $$IDE_APP_PATH
+    else: \
+        IDE_LIBEXEC_PATH = $$IDE_BUILD_TREE/libexec/qtcreator
     !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
 }
 
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 9bd047c860..b2dd649476 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -41,8 +41,9 @@ Project {
             ? ide_app_target + ".app/Contents/Resources"
             : "share/qtcreator"
     property string ide_libexec_path: qbs.targetOS.contains("osx")
-            ? ide_data_path
-            : ide_app_path
+            ? ide_data_path : qbs.targetOS.contains("windows")
+            ? ide_app_path
+            : "libexec/qtcreator"
     property string ide_doc_path: qbs.targetOS.contains("osx")
             ? ide_data_path + "/doc"
             : "share/doc/qtcreator"
diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index f7bf539f2f..23d2074785 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -117,6 +117,9 @@ def fix_rpaths(chrpath_bin, install_dir):
         #TODO remove library_helper once all libs moved out of bin/ on linux
         filenames = [filename for filename in filenames if check_unix_binary_exec_helper(dirpath, filename) or check_unix_library_helper(dirpath, filename)]
         fix_rpaths_helper(chrpath_bin, install_dir, dirpath, filenames)
+    for dirpath, dirnames, filenames in os.walk(os.path.join(install_dir, 'libexec', 'qtcreator')):
+        filenames = [filename for filename in filenames if check_unix_binary_exec_helper(dirpath, filename)]
+        fix_rpaths_helper(chrpath_bin, install_dir, dirpath, filenames)
     for dirpath, dirnames, filenames in os.walk(os.path.join(install_dir, 'lib')):
         filenames = [filename for filename in filenames if check_unix_library_helper(dirpath, filename)]
         fix_rpaths_helper(chrpath_bin, install_dir, dirpath, filenames)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
index 2ea5d2a011..1ae7d12fe9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -43,6 +43,6 @@ osx {
     CONFIG -= app_bundle
     QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$system_quote($$PWD/Info.plist)
 } else {
-    target.path  = $$QTC_PREFIX/bin
+    target.path  = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE)
     INSTALLS    += target
 }
diff --git a/src/libs/utils/process_ctrlc_stub.pro b/src/libs/utils/process_ctrlc_stub.pro
index 4fef59a401..67ff146ac6 100644
--- a/src/libs/utils/process_ctrlc_stub.pro
+++ b/src/libs/utils/process_ctrlc_stub.pro
@@ -17,5 +17,5 @@ build_all:!build_pass {
     CONFIG += release
 }
 
-target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
+target.path  = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE)
 INSTALLS    += target
diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro
index a3eea0f131..c261577fd2 100644
--- a/src/libs/utils/process_stub.pro
+++ b/src/libs/utils/process_stub.pro
@@ -20,5 +20,5 @@ unix {
     LIBS += -lshell32
 }
 
-target.path  = $$QTC_PREFIX/bin # FIXME: libexec, more or less
+target.path  = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE)
 INSTALLS    += target
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index a99fab23c5..89047d7684 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -432,9 +432,21 @@ QString ICore::documentationPath()
  */
 QString ICore::libexecPath()
 {
-    const QString libexecPath = QLatin1String(Utils::HostOsInfo::isMacHost()
-                                            ? "/../Resources" : "");
-    return QDir::cleanPath(QCoreApplication::applicationDirPath() + 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);
 }
 
 static QString compilerString()
diff --git a/src/qtcreatortool.pri b/src/qtcreatortool.pri
index b34a72eefc..3fb262ad1d 100644
--- a/src/qtcreatortool.pri
+++ b/src/qtcreatortool.pri
@@ -6,6 +6,6 @@ TEMPLATE = app
 CONFIG += console
 CONFIG -= app_bundle
 
-DESTDIR = $${IDE_LIBEXEC_PATH}
-target.path  = $${QTC_PREFIX}/bin # FIXME: libexec, more or less
+DESTDIR = $$IDE_LIBEXEC_PATH
+target.path = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE)
 INSTALLS += target
diff --git a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro
index 80c51fa9a6..bc45de844d 100644
--- a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro
+++ b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro
@@ -4,7 +4,7 @@ TEMPLATE = app
 
 include(../../../../qtcreator.pri)
 
-DESTDIR = $$IDE_BIN_PATH
+DESTDIR = $$IDE_LIBEXEC_PATH
 
 include(../../../rpath.pri)