From b825ac4355e590cc60a4246bd403c55b84de9c4d Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Wed, 3 Dec 2008 10:27:12 +0100
Subject: [PATCH] Fixed the build system. Generate the object files for release
and debug builds in different directories.
---
src/qworkbench.pri | 11 +++++++++++
src/qworkbenchplugin.pri | 7 -------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/qworkbench.pri b/src/qworkbench.pri
index d7ac4f34c5a..e869ce452a8 100644
--- a/src/qworkbench.pri
+++ b/src/qworkbench.pri
@@ -39,3 +39,14 @@ DEPENDPATH += \
$$IDE_SOURCE_TREE/tools \
LIBS += -L$$IDE_LIBRARY_PATH
+
+unix {
+ debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
+ release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared
+
+ debug:MOC_DIR = $${OUT_PWD}/.moc/debug-shared
+ release:MOC_DIR = $${OUT_PWD}/.moc/release-shared
+
+ RCC_DIR = $${OUT_PWD}/.rcc/
+ UI_DIR = $${OUT_PWD}/.uic/
+}
diff --git a/src/qworkbenchplugin.pri b/src/qworkbenchplugin.pri
index 50b667fc716..e598570259a 100644
--- a/src/qworkbenchplugin.pri
+++ b/src/qworkbenchplugin.pri
@@ -47,11 +47,4 @@ macx {
}
-unix {
- OBJECTS_DIR = $${OUT_PWD}/.obj/
- MOC_DIR = $${OUT_PWD}/.moc/
- RCC_DIR = $${OUT_PWD}/.rcc/
- UI_DIR = $${OUT_PWD}/.uic/
-}
-
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
--
GitLab