diff --git a/qtcreator.pri b/qtcreator.pri index abd82b2cb4eedf21988e280bfd52fcca2f93b435..5d4e4909710a1c968dc7f44e3fe4cbb678b4a937 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_ sub_dir ~= s,^$$re_escape($$PWD),, IDE_BUILD_TREE = $$cleanPath($$OUT_PWD) IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, +IDE_APP_PATH = $$IDE_BUILD_TREE/bin macx { IDE_APP_TARGET = QtCreator - IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns + IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH - IDE_DATA_PATH = $$IDE_BUILD_TREE/bin/$${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 contains(QT_CONFIG, ppc):CONFIG += ppc x86 } else { win32 { @@ -53,9 +55,9 @@ macx { } 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_APP_PATH = $$IDE_BUILD_TREE/bin INCLUDEPATH += \ $$IDE_SOURCE_TREE/src/libs \ diff --git a/src/app/app.pro b/src/app/app.pro index 9db8d5949def01bdbc730b241806a27b995cfd1d..3bb47607f0edf9d307a0ab06e1327a895b6ecbff 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri) TEMPLATE = app TARGET = $$IDE_APP_TARGET -DESTDIR = ../../bin +DESTDIR = $$IDE_APP_PATH SOURCES += main.cpp diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro index 33cb63aa162d13f52a375f8b0b776e8bca1a935e..f87c13631e8d4fce6b81fb955b1a2630f0268b21 100644 --- a/src/libs/utils/process_stub.pro +++ b/src/libs/utils/process_stub.pro @@ -2,11 +2,7 @@ include(../../../qtcreator.pri) TEMPLATE = app TARGET = qtcreator_process_stub -macx { - DESTDIR = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources -} else { - DESTDIR = ../../../bin -} +DESTDIR = $$IDE_LIBEXEC_PATH CONFIG += warn_on console use_c_linker CONFIG -= qt app_bundle @@ -23,5 +19,5 @@ unix { LIBS += -lshell32 } -target.path = /bin +target.path = /bin # FIXME: libexec, more or less INSTALLS += target diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro index 9c99034187da0dff2f5fd1b633ca8357c4cc8818..896203a17c4083f609a879e045fdfc7a7041a7f0 100644 --- a/src/plugins/debugger/dumper.pro +++ b/src/plugins/debugger/dumper.pro @@ -1,9 +1,11 @@ +# This is a compile check for the dumpers only. Don't install the library! + include(../../qworkbenchlibrary.pri) TEMPLATE = lib TARGET = DebuggingHelper CONFIG += shared -DESTDIR = ../../../bin +DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ... linux-* { CONFIG -= release