Changeset 44606 in webkit

Timestamp:

Jun 11, 2009 10:39:21 AM (15 years ago)

Author:

ariya@webkit.org

Message:

2009-06-11 Laszlo Gombos <Laszlo Gombos>

Reviewed by Holger Freyther.

[Qt] Fix release build detection
​https://bugs.webkit.org/show_bug.cgi?id=26267

• WebKit.pri:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebKit.pri (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-06-11  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Fix release build detection
+        https://bugs.webkit.org/show_bug.cgi?id=26267
+
+        * WebKit.pri:
+
 2009-06-10  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebKit.pri

@@ -3 +3 @@
 
 isEmpty(OUTPUT_DIR) {
-    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
-    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+    CONFIG(debug, debug|release) {
+        OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+    } else { # Release
+        OUTPUT_DIR=$$PWD/WebKitBuild/Release
+    }
 }
 
@@ -26 +29 @@
 
 DEFINES += USE_SYSTEM_MALLOC
-CONFIG(release) {
+CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }