diff options
| -rw-r--r-- | qtcreator.pri | 2 | ||||
| -rw-r--r-- | qtcreator.pro | 3 | ||||
| -rw-r--r-- | share/qtcreator/static.pro | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 5d4e490971..205cdc607e 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -46,6 +46,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 contains(QT_CONFIG, ppc):CONFIG += ppc x86 + copydata = 1 } else { win32 { IDE_APP_TARGET = qtcreator @@ -57,6 +58,7 @@ macx { IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator + !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1 } INCLUDEPATH += \ diff --git a/qtcreator.pro b/qtcreator.pro index 7480776c2e..eb58db0d52 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -4,10 +4,11 @@ contains(QT_VERSION, ^4\.[0-4]\..*) { error("Use at least Qt 4.5.") } +include(qtcreator.pri) include(doc/doc.pri) TEMPLATE = subdirs CONFIG += ordered SUBDIRS = src share -unix:!macx:!equals(_PRO_FILE_PWD_, $$OUT_PWD):SUBDIRS += bin +unix:!macx:!isEmpty(copydata):SUBDIRS += bin diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 482aebee19..3c427429b0 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -37,7 +37,7 @@ DATA_DIRS = \ schemes \ gdbmacros -macx|!equals(_PRO_FILE_PWD_, $$OUT_PWD) { +!isEmpty(copydata) { for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*.*, true) |