From e4871393c6d9851e490b4a1ad5d626f0afbc7767 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 10 Jun 2010 10:18:54 +0200
Subject: [PATCH] QmlJS: Fix target directory for qmldump executable on Mac.
Reviewed-by: ckamm
---
qtcreator.pri | 2 ++
src/tools/qml/qmldump/qmldump.pro | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index b4ca541b0f2..5afb19c495e 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -60,6 +60,7 @@ macx {
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DOC_PATH = $$IDE_DATA_PATH/doc
+ IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS
contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1
} else {
@@ -75,6 +76,7 @@ macx {
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
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
}
diff --git a/src/tools/qml/qmldump/qmldump.pro b/src/tools/qml/qmldump/qmldump.pro
index 5bdb8ee15b3..97257c718f9 100644
--- a/src/tools/qml/qmldump/qmldump.pro
+++ b/src/tools/qml/qmldump/qmldump.pro
@@ -14,5 +14,5 @@ TEMPLATE = app
SOURCES += main.cpp
include(../../../../qtcreator.pri)
-DESTDIR = $$IDE_APP_PATH
+DESTDIR = $$IDE_BIN_PATH
include(../../../rpath.pri)
--
GitLab