Changeset 104034 in webkit for trunk/Source/JavaScriptCore/jsc.pro

Timestamp:

Jan 4, 2012, 6:21:10 AM (13 years ago)

Author:

[email protected]

Message:

[Qt] Introduce new qmake variable 'WEBKIT' for signaling dependencies

The custom qmake variable 'WEBKIT' is used for signaling that a
target depends in some way on other subproject of the WebKit
project. For now this is limited to the set of intermediate
libraries: wtf, javascriptcore, webcore, and webkit2.

This replaces the previous convension of using load(foo) for
just include paths, and CONFIG += foo to also link against foo.

Adding a dependency results in additional include paths being
available, and potentially linking to the library. This is
decided by the build system based on conditions such as what
kind of target is being built and the general build config.

An advantage to his approach is that it simplifies the individual
foo.prf files, for example by allowing us to use INCLUDEPATH +=
and LIBS += as normal instead of prepending.

Reviewed by Simon Hausmann.

File:

• trunk/Source/JavaScriptCore/jsc.pro (modified) (1 diff)

trunk/Source/JavaScriptCore/jsc.pro

@@ -16 +16 @@
 win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32
 
-CONFIG += javascriptcore wtf
+WEBKIT += javascriptcore wtf
 
 SOURCES = jsc.cpp