Skip to content
Snippets Groups Projects
Commit e4768944 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

fix shadow build detection

parent 5562f71d
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ macx { ...@@ -46,6 +46,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
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1
} else { } else {
win32 { win32 {
IDE_APP_TARGET = qtcreator IDE_APP_TARGET = qtcreator
...@@ -57,6 +58,7 @@ macx { ...@@ -57,6 +58,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
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
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
} }
INCLUDEPATH += \ INCLUDEPATH += \
......
...@@ -4,10 +4,11 @@ contains(QT_VERSION, ^4\.[0-4]\..*) { ...@@ -4,10 +4,11 @@ contains(QT_VERSION, ^4\.[0-4]\..*) {
error("Use at least Qt 4.5.") error("Use at least Qt 4.5.")
} }
include(qtcreator.pri)
include(doc/doc.pri) include(doc/doc.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = src share 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 = \ ...@@ -37,7 +37,7 @@ DATA_DIRS = \
schemes \ schemes \
gdbmacros gdbmacros
macx|!equals(_PRO_FILE_PWD_, $$OUT_PWD) { !isEmpty(copydata) {
for(data_dir, DATA_DIRS) { for(data_dir, DATA_DIRS) {
files = $$files($$PWD/$$data_dir/*.*, true) files = $$files($$PWD/$$data_dir/*.*, true)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment