diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-06 16:18:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-06 20:25:20 +0200 |
| commit | e3885f280bc6b7d733cde47c490b275cac1ddcc4 (patch) | |
| tree | a4b6fde559a879751331fa5dfdf700bead3db50c /qtcreator.pri | |
| parent | 97ffee6bdd8cc7cbb4eb709057a3973773222795 (diff) | |
use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index abd82b2cb4e..5d4e4909710 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 \ |