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

2 files changed, 14 insertions, 8 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index fa49e4f..edc4c6f 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -1,6 +1,11 @@
 # JavaScriptCore - Qt4 build info
 VPATH += $$PWD
-JAVASCRIPTCORE_TARGET = jscore
+# Output in JavaScriptCore/<config>
+CONFIG(debug, debug|release): JAVASCRIPTCORE_DESTDIR = debug
+CONFIG(release, debug|release): JAVASCRIPTCORE_DESTDIR = release
+# Use different targets to prevent parallel builds file clashes on Mac
+CONFIG(debug, debug|release): JAVASCRIPTCORE_TARGET = jscored
+CONFIG(release, debug|release): JAVASCRIPTCORE_TARGET = jscore
 
 CONFIG(standalone_package) {
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated
@@ -61,9 +66,8 @@ wince* {
 
 
 defineTest(addJavaScriptCoreLib) {
-    pathToJavaScriptCoreOutput = $$ARGS
-    CONFIG(debug_and_release):CONFIG(debug, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/debug
-    CONFIG(debug_and_release):CONFIG(release, debug|release): pathToJavaScriptCoreOutput = $$pathToJavaScriptCoreOutput/release
+    # Argument is the relative path to JavaScriptCore.pro's qmake output
+    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
 
     win32-msvc* {
         LIBS += -L$$pathToJavaScriptCoreOutput
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