diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
| commit | aa46e5928b8fd97bada814e56134adb23a068b24 (patch) | |
| tree | df917faf833909ad09fc1b83ffde3ba9404dfd51 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| parent | b7c63e3d89006c9795835a79741b8d7a46891f93 (diff) | |
| parent | 5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (diff) | |
| download | Qt-aa46e5928b8fd97bada814e56134adb23a068b24.zip Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.gz Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro index 56dae05..28f0e6b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro @@ -21,13 +21,16 @@ CONFIG(QTDIR_build) { } isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp -GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/ -win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\| +GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP} INCLUDEPATH += $$GENERATED_SOURCES_DIR !CONFIG(QTDIR_build) { - OBJECTS_DIR = tmp + CONFIG(debug, debug|release) { + OBJECTS_DIR = obj/debug + } else { # Release + OBJECTS_DIR = obj/release + } } include($$OUTPUT_DIR/config.pri) @@ -64,7 +67,7 @@ include(JavaScriptCore.pri) QMAKE_EXTRA_TARGETS += generated_files -qt-port: lessThan(QT_MINOR_VERSION, 4) { +lessThan(QT_MINOR_VERSION, 4) { DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE="" } |