QtWebKit: Fix build on mac.

- Enables debug_and_release explicitely since qbase.pri does
- Make DESTDIR always go in JavaScriptCore/<configuration>, not
  dependent on the debug_and_release config
- Use different targets for debug and release to prevent file clashes
This commit should be overwritten on the next WebKit import

Reviewed-by: TrustMe

1 files changed, 6 insertions, 4 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index 4056787..d71977d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -8,16 +8,18 @@ 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(debug_and_release):CONFIG(debug, debug|release): DESTDIR = debug
-CONFIG(debug_and_release):CONFIG(release, debug|release): DESTDIR = release
-
-!CONFIG(QTDIR_build) {
+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, debug|release) {
         OBJECTS_DIR = obj/debug
     } else { # Release