diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-06 18:26:59 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-06 18:26:59 (GMT) |
| commit | 109024630cbf577d6f6bcb10ea3ac6272113b79e (patch) | |
| tree | 92dcb243f3ac3cadb1efdc7a3a646f880c544955 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | a182cc5d5d7a70d0423a42123bb7c1cf21709e0d (diff) | |
| parent | 4a934cb8bb610119367f918957d871fbbc2799ff (diff) | |
| download | Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.zip Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.tar.gz Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index 8aa914f..b7f6665 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -1,12 +1,14 @@ # JavaScriptCore - Qt4 build info VPATH += $$PWD -# Output in JavaScriptCore/<config> -CONFIG(debug, debug|release): JAVASCRIPTCORE_DESTDIR = debug -CONFIG(release, debug|release): JAVASCRIPTCORE_DESTDIR = release -# Use different targets to prevent parallel builds file clashes on Mac -CONFIG(debug, debug|release): JAVASCRIPTCORE_TARGET = jscored -CONFIG(release, debug|release): JAVASCRIPTCORE_TARGET = jscore - +CONFIG(debug, debug|release) { + # Output in JavaScriptCore/<config> + JAVASCRIPTCORE_DESTDIR = debug + # Use a config-specific target to prevent parallel builds file clashes on Mac + JAVASCRIPTCORE_TARGET = jscored +} else { + JAVASCRIPTCORE_DESTDIR = release + JAVASCRIPTCORE_TARGET = jscore +} CONFIG(standalone_package) { isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated } else { @@ -74,10 +76,12 @@ defineTest(addJavaScriptCoreLib) { pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR win32-msvc* { - QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput + LIBS += -L$$pathToJavaScriptCoreOutput LIBS += -l$$JAVASCRIPTCORE_TARGET } else:symbian { LIBS += -l$${JAVASCRIPTCORE_TARGET}.lib + # The default symbian build system does not use library paths at all. However when building with + # qmake's symbian makespec that uses Makefiles QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput } else { # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW |