diff --git a/qtcreator.pri b/qtcreator.pri index b4ca541b0f20a8874dd641da69126abbc0a0e775..5afb19c495ed8543baf964c556a22f8a701db7d9 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 5bdb8ee15b3980e91728bae3ceb8ce6be9903e3b..97257c718f994c8716deac4647debb542e845ffb 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)