summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index d71977d..4056787 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -8,18 +8,16 @@ CONFIG += staticlib
# Don't use JavaScriptCore as the target name. qmake would create a JavaScriptCore.vcproj for msvc
# which already exists as a directory
TARGET = $$JAVASCRIPTCORE_TARGET
-DESTDIR = $$JAVASCRIPTCORE_DESTDIR
QT += core
CONFIG += depend_includepath
contains(QT_CONFIG, embedded):CONFIG += embedded
-CONFIG(QTDIR_build) {
- # Make sure we compile both debug and release on mac when inside Qt.
- # This line was extracted from qbase.pri instead of including the whole file
- win32|mac:!macx-xcode:CONFIG += debug_and_release
-} else {
+CONFIG(debug_and_release):CONFIG(debug, debug|release): DESTDIR = debug
+CONFIG(debug_and_release):CONFIG(release, debug|release): DESTDIR = release
+
+!CONFIG(QTDIR_build) {
CONFIG(debug, debug|release) {
OBJECTS_DIR = obj/debug
} else { # Release