Changeset 591 for trunk/src


Ignore:
Timestamp:
Feb 23, 2010, 12:30:08 AM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

3rdparty: JavaScriptCore: Don't create separate out directories in QTDIR_build mode.

Location:
trunk/src/3rdparty
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri

    r561 r591  
    44CONFIG(debug, debug|release) {
    55    isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}debug
    6     OBJECTS_DIR = obj/debug
     6    !CONFIG(QTDIR_build):OBJECTS_DIR = obj/debug
    77} else { # Release
    88    isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}release
    9     OBJECTS_DIR = obj/release
     9    !CONFIG(QTDIR_build):OBJECTS_DIR = obj/release
    1010}
    1111

  • trunk/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri

    r561 r591  
    44CONFIG(debug, debug|release) {
    55    isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}debug
    6     OBJECTS_DIR = obj/debug
     6    !CONFIG(QTDIR_build):OBJECTS_DIR = obj/debug
    77} else { # Release
    88    isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}release
    9     OBJECTS_DIR = obj/release
     9    !CONFIG(QTDIR_build):OBJECTS_DIR = obj/release
    1010}
    1111
Note: See TracChangeset for help on using the changeset viewer.