[Qt] Detect debug mode consistently
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 May 2010 20:56:51 +0000 (20:56 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 May 2010 20:56:51 +0000 (20:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=38863

Patch by Laszlo Gombos <laszlo.1.gombos@nokia.com> on 2010-05-12
Reviewed by Kenneth Rohde Christiansen.

.:

* WebKit.pri:

JavaScriptCore:

* JavaScriptCore.pri:
* JavaScriptCore.pro:
* jsc.pro:
* qt/api/QtScript.pro:

WebCore:

No new tests as there is no new functionality.

* WebCore.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@59264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/JavaScriptCore.pro
JavaScriptCore/jsc.pro
JavaScriptCore/qt/api/QtScript.pro
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit.pri

index 72387bb..890575b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        * WebKit.pri:
+
 2010-05-08  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
index cb9932e..129672e 100644 (file)
@@ -1,3 +1,15 @@
+2010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        * JavaScriptCore.pri:
+        * JavaScriptCore.pro:
+        * jsc.pro:
+        * qt/api/QtScript.pro:
+
 2010-05-12  Peter Varga  <pvarga@inf.u-szeged.hu>
 
         Reviewed by Gavin Barraclough.
index 50a8f3b..09dba2f 100644 (file)
@@ -1,6 +1,6 @@
 # JavaScriptCore - Qt4 build info
 VPATH += $$PWD
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
     # Output in JavaScriptCore/<config>
     JAVASCRIPTCORE_DESTDIR = debug
     # Use a config-specific target to prevent parallel builds file clashes on Mac
index 00ee8e6..5378857 100644 (file)
@@ -21,7 +21,7 @@ CONFIG(QTDIR_build) {
     # 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) {
+    !CONFIG(release, debug|release) {
         OBJECTS_DIR = obj/debug
     } else { # Release
         OBJECTS_DIR = obj/release
index 420a3f1..20b8521 100644 (file)
@@ -15,7 +15,7 @@ CONFIG += link_pkgconfig
 
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
     OBJECTS_DIR = obj/debug
 } else { # Release
     OBJECTS_DIR = obj/release
index 88629c7..3c2691e 100644 (file)
@@ -7,7 +7,7 @@ INCLUDEPATH += $$PWD
 CONFIG += building-libs
 
 isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
     OBJECTS_DIR = obj/debug
 } else { # Release
     OBJECTS_DIR = obj/release
index e5afc9c..313a762 100644 (file)
@@ -1,3 +1,14 @@
+2010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        No new tests as there is no new functionality.
+
+        * WebCore.pro:
+
 2010-05-12  James Robinson  <jamesr@chromium.org>
 
         Patch by Dan Bernstein.
index 19bb18c..5276c51 100644 (file)
@@ -59,7 +59,7 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
 
-    CONFIG(debug, debug|release) {
+    !CONFIG(release, debug|release) {
         OBJECTS_DIR = obj/debug
     } else { # Release
         OBJECTS_DIR = obj/release
index 98d47a0..8b51d3e 100644 (file)
@@ -22,7 +22,7 @@ building-libs {
             QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
         } else {
             win32-*|wince* {
-                CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
+                !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
                 QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION}
                 win32-g++: LIBS += -l$$QTWEBKITLIBNAME
                 else: LIBS += $${QTWEBKITLIBNAME}.lib