Commit e4768944 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

fix shadow build detection

parent 5562f71d
......@@ -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 += \
......
......@@ -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
......@@ -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)
......
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