Commit e4871393 authored by con's avatar con
Browse files

QmlJS: Fix target directory for qmldump executable on Mac.

Reviewed-by: ckamm
parent cc508bec
...@@ -60,6 +60,7 @@ macx { ...@@ -60,6 +60,7 @@ macx {
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources 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_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DOC_PATH = $$IDE_DATA_PATH/doc 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 contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1 copydata = 1
} else { } else {
...@@ -75,6 +76,7 @@ macx { ...@@ -75,6 +76,7 @@ macx {
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/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 !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
} }
......
...@@ -14,5 +14,5 @@ TEMPLATE = app ...@@ -14,5 +14,5 @@ TEMPLATE = app
SOURCES += main.cpp SOURCES += main.cpp
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
DESTDIR = $$IDE_APP_PATH DESTDIR = $$IDE_BIN_PATH
include(../../../rpath.pri) include(../../../rpath.pri)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment