Changeset 59264 in webkit


Ignore:
Timestamp:
May 12, 2010 1:56:51 PM (14 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt] Detect debug mode consistently
https://bugs.webkit.org/show_bug.cgi?id=38863

Patch by Laszlo Gombos <Laszlo Gombos> on 2010-05-12
Reviewed by Kenneth Rohde Christiansen.

.:

  • WebKit.pri:

JavaScriptCore:

WebCore:

No new tests as there is no new functionality.

  • WebCore.pro:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r59031 r59264  
     12010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Detect debug mode consistently
     6        https://bugs.webkit.org/show_bug.cgi?id=38863
     7
     8        * WebKit.pri:
     9
    1102010-05-08  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    211
  • trunk/JavaScriptCore/ChangeLog

    r59222 r59264  
     12010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Detect debug mode consistently
     6        https://bugs.webkit.org/show_bug.cgi?id=38863
     7
     8        * JavaScriptCore.pri:
     9        * JavaScriptCore.pro:
     10        * jsc.pro:
     11        * qt/api/QtScript.pro:
     12
    1132010-05-12  Peter Varga  <pvarga@inf.u-szeged.hu>
    214
  • trunk/JavaScriptCore/JavaScriptCore.pri

    r59060 r59264  
    11# JavaScriptCore - Qt4 build info
    22VPATH += $$PWD
    3 CONFIG(debug, debug|release) {
     3!CONFIG(release, debug|release) {
    44    # Output in JavaScriptCore/<config>
    55    JAVASCRIPTCORE_DESTDIR = debug
  • trunk/JavaScriptCore/JavaScriptCore.pro

    r59187 r59264  
    2222    win32|mac:!macx-xcode:CONFIG += debug_and_release
    2323} else {
    24     CONFIG(debug, debug|release) {
     24    !CONFIG(release, debug|release) {
    2525        OBJECTS_DIR = obj/debug
    2626    } else { # Release
  • trunk/JavaScriptCore/jsc.pro

    r56623 r59264  
    1616QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
    1717
    18 CONFIG(debug, debug|release) {
     18!CONFIG(release, debug|release) {
    1919    OBJECTS_DIR = obj/debug
    2020} else { # Release
  • trunk/JavaScriptCore/qt/api/QtScript.pro

    r56623 r59264  
    88
    99isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated
    10 CONFIG(debug, debug|release) {
     10!CONFIG(release, debug|release) {
    1111    OBJECTS_DIR = obj/debug
    1212} else { # Release
  • trunk/WebCore/ChangeLog

    r59263 r59264  
     12010-05-12  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Detect debug mode consistently
     6        https://bugs.webkit.org/show_bug.cgi?id=38863
     7
     8        No new tests as there is no new functionality.
     9
     10        * WebCore.pro:
     11
    1122010-05-12  James Robinson  <jamesr@chromium.org>
    213
  • trunk/WebCore/WebCore.pro

    r59235 r59264  
    6060    isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
    6161
    62     CONFIG(debug, debug|release) {
     62    !CONFIG(release, debug|release) {
    6363        OBJECTS_DIR = obj/debug
    6464    } else { # Release
  • trunk/WebKit.pri

    r58756 r59264  
    2323        } else {
    2424            win32-*|wince* {
    25                 CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
     25                !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
    2626                QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION}
    2727                win32-g++: LIBS += -l$$QTWEBKITLIBNAME
Note: See TracChangeset for help on using the changeset viewer.