Changeset 99666 in webkit for trunk/Source/JavaScriptCore/wtf/wtf.pri

Timestamp:

Nov 9, 2011, 12:52:43 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Build system cleanup
​https://bugs.webkit.org/show_bug.cgi?id=71815

Reviewed by Kenneth Rohde Christiansen.

Source/JavaScriptCore:

• wtf/wtf.pri: Moved the glib dependency to javascriptcore.prf.

Source/WebCore:

• Target.pri: Removed CodeGenHSL.cpp from the angle build. In the angle build the back-end has to

be either GLSL or HSL, it can't be both. Make a choice for GLSL as that's what it seems to be used for
at the moment.

Source/WebKit2:

• Target.pri: Removed duplicated sources that are compiled also into QtWebKit.so through api.pri.
• UIProcess/qt/WebGeolocationProviderQt.cpp: Include the moc file here, as it should only be compiled

if geolocation is enabled.

• UIProcess/qt/WebGeolocationProviderQt.h: Provide ENABLE(GEOLOCATION) guards around class definition.

Tools:

• WebKitTestRunner/InjectedBundle/Target.pri: We don't need to link against the webkit2

static library.

• qmake/mkspecs/features/javascriptcore.prf: The wtf sources pull in a glib dependency

(ownPtr functions for glib types). Propagate that to everyone using javascriptcore.

File:

• trunk/Source/JavaScriptCore/wtf/wtf.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/wtf/wtf.pri

@@ -190 +190 @@
     wtf/unicode/UTF8.cpp
 
-linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-    !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
-        DEFINES += ENABLE_GLIB_SUPPORT=1
-        PKGCONFIG += glib-2.0 gio-2.0
-
-        HEADERS += wtf/gobject/GOwnPtr.h
-    }
-}
-
 unix: SOURCES += wtf/OSAllocatorPosix.cpp
 win*|wince*: SOURCES += wtf/OSAllocatorWin.cpp