diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-06 16:02:06 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-06 20:25:20 +0200 |
| commit | 97ffee6bdd8cc7cbb4eb709057a3973773222795 (patch) | |
| tree | 4cb446e8bbae4d53a463e5248405900efbb5df73 | |
| parent | 905f3d6c30dbab2bd97bd323fec2fe1f218f42fb (diff) | |
automate setting IDE_BUILD_TREE
| -rw-r--r-- | bin/bin.pro | 2 | ||||
| -rw-r--r-- | qtcreator.pri | 11 | ||||
| -rw-r--r-- | share/qtcreator/static.pro | 2 | ||||
| -rw-r--r-- | share/qtcreator/translations/translations.pro | 1 | ||||
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/libs/utils/process_stub.pro | 1 | ||||
| -rw-r--r-- | src/plugins/debugger/dumper.pro | 2 | ||||
| -rw-r--r-- | src/qworkbenchlibrary.pri | 1 | ||||
| -rw-r--r-- | src/qworkbenchplugin.pri | 3 |
9 files changed, 6 insertions, 19 deletions
diff --git a/bin/bin.pro b/bin/bin.pro index f0352035b8..959be0aedc 100644 --- a/bin/bin.pro +++ b/bin/bin.pro @@ -1,5 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/.. - include(../qtcreator.pri) TEMPLATE = app diff --git a/qtcreator.pri b/qtcreator.pri index 0166ab6c96..abd82b2cb4 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,5 +1,3 @@ -IDE_SOURCE_TREE = $$PWD - defineReplace(cleanPath) { win32:1 ~= s|\\\\|/|g contains(1, ^/.*):pfx = / @@ -35,10 +33,11 @@ equals(TEST, 1) { DEFINES += WITH_TESTS } -isEmpty(IDE_BUILD_TREE) { - error("qtcreator.pri: including file must define IDE_BUILD_TREE (probably a relative path)") -} -IDE_BUILD_TREE = $$cleanPath($$IDE_BUILD_TREE) +IDE_SOURCE_TREE = $$PWD +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)$,, macx { IDE_APP_TARGET = QtCreator IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index bf72fc0844..482aebee19 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -1,5 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/../.. - include(../../qtcreator.pri) win32:i_flag = i diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index 2021a405d8..d404128cdf 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -1,4 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/../../.. include(../../../qtcreator.pri) TRANSLATIONS = de ja diff --git a/src/app/app.pro b/src/app/app.pro index 31864cc8b7..9db8d5949d 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -1,5 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/../.. - include(../../qtcreator.pri) include(../shared/qtsingleapplication/qtsingleapplication.pri) diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro index 087e106369..33cb63aa16 100644 --- a/src/libs/utils/process_stub.pro +++ b/src/libs/utils/process_stub.pro @@ -1,4 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/../../.. include(../../../qtcreator.pri) TEMPLATE = app diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro index 1f2d5f279c..9c99034187 100644 --- a/src/plugins/debugger/dumper.pro +++ b/src/plugins/debugger/dumper.pro @@ -1,9 +1,9 @@ +include(../../qworkbenchlibrary.pri) TEMPLATE = lib TARGET = DebuggingHelper CONFIG += shared DESTDIR = ../../../bin -include(../../qworkbenchlibrary.pri) linux-* { CONFIG -= release diff --git a/src/qworkbenchlibrary.pri b/src/qworkbenchlibrary.pri index 7d260b6a4a..fb92b5202a 100644 --- a/src/qworkbenchlibrary.pri +++ b/src/qworkbenchlibrary.pri @@ -1,4 +1,3 @@ -IDE_BUILD_TREE = $$OUT_PWD/../../.. include(../qtcreator.pri) win32 { diff --git a/src/qworkbenchplugin.pri b/src/qworkbenchplugin.pri index a6143a9c77..b644438fc7 100644 --- a/src/qworkbenchplugin.pri +++ b/src/qworkbenchplugin.pri @@ -1,6 +1,3 @@ -isEmpty(IDE_BUILD_TREE) { - IDE_BUILD_TREE = $$OUT_PWD/../../.. -} include(../qtcreator.pri) isEmpty(PROVIDER) { |