- Revision
- 99666
- Author
- [email protected]
- Date
- 2011-11-09 00:52:43 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Build system cleanup
https://bugs.webkit.org/show_bug.cgi?id=71815
Reviewed by Kenneth Rohde Christiansen.
Source/_javascript_Core:
* wtf/wtf.pri: Moved the glib dependency to _javascript_core.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/_javascript_core.prf: The wtf sources pull in a glib dependency
(ownPtr functions for glib types). Propagate that to everyone using _javascript_core.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (99665 => 99666)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-09 08:52:43 UTC (rev 99666)
@@ -1,3 +1,12 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Build system cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=71815
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * wtf/wtf.pri: Moved the glib dependency to _javascript_core.prf.
+
2011-11-08 Simon Hausmann <[email protected]>
[Qt] Replace use of QApplication with QGuiApplication
Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (99665 => 99666)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-11-09 08:52:43 UTC (rev 99666)
@@ -189,14 +189,5 @@
wtf/unicode/icu/CollatorICU.cpp \
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
Modified: trunk/Source/WebCore/ChangeLog (99665 => 99666)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 08:52:43 UTC (rev 99666)
@@ -1,3 +1,14 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Build system cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=71815
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * 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.
+
2011-11-09 Mark Rowe <[email protected]>
Fix the build.
Modified: trunk/Source/WebCore/Target.pri (99665 => 99666)
--- trunk/Source/WebCore/Target.pri 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebCore/Target.pri 2011-11-09 08:52:43 UTC (rev 99666)
@@ -3741,7 +3741,6 @@
ANGLE_SOURCES += \
$$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
- $$ANGLE_DIR/src/compiler/CodeGenHLSL.cpp \
$$ANGLE_DIR/src/compiler/Compiler.cpp \
$$ANGLE_DIR/src/compiler/debug.cpp \
$$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
Modified: trunk/Source/WebKit2/ChangeLog (99665 => 99666)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 08:52:43 UTC (rev 99666)
@@ -1,3 +1,15 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Build system cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=71815
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * 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.
+
2011-11-08 Simon Hausmann <[email protected]>
[Qt] Replace use of QApplication with QGuiApplication
Modified: trunk/Source/WebKit2/Target.pri (99665 => 99666)
--- trunk/Source/WebKit2/Target.pri 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebKit2/Target.pri 2011-11-09 08:52:43 UTC (rev 99666)
@@ -17,12 +17,6 @@
QT += declarative
-WEBKIT1_HEADERS_SHARED_WITH_WEBKIT2= \
- $$PWD/../WebKit/qt/WebCoreSupport/QtWebComboBox.h
-
-WEBKIT1_SOURCES_SHARED_WITH_WEBKIT2 = \
- $$PWD/../WebKit/qt/WebCoreSupport/QtWebComboBox.cpp
-
WEBKIT2_GENERATED_HEADERS = \
$$WEBKIT2_GENERATED_SOURCES_DIR/AuthenticationManagerMessages.h \
$$WEBKIT2_GENERATED_SOURCES_DIR/DownloadProxyMessages.h \
@@ -338,8 +332,7 @@
WebProcess/WebProcess.h \
WebProcess/qt/QtBuiltinBundle.h \
WebProcess/qt/QtBuiltinBundlePage.h \
- $$WEBKIT2_GENERATED_HEADERS \
- $$WEBKIT1_HEADERS_SHARED_WITH_WEBKIT2
+ $$WEBKIT2_GENERATED_HEADERS
SOURCES += \
Platform/CoreIPC/ArgumentCoders.cpp \
@@ -606,10 +599,8 @@
WebProcess/WebProcess.cpp \
WebProcess/qt/QtBuiltinBundle.cpp \
WebProcess/qt/QtBuiltinBundlePage.cpp \
- WebProcess/qt/WebProcessMainQt.cpp \
WebProcess/qt/WebProcessQt.cpp \
- $$WEBKIT2_GENERATED_SOURCES \
- $$WEBKIT1_SOURCES_SHARED_WITH_WEBKIT2
+ $$WEBKIT2_GENERATED_SOURCES
contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=0) {
DEFINES += PLUGIN_ARCHITECTURE_UNSUPPORTED
Modified: trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp (99665 => 99666)
--- trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp 2011-11-09 08:52:43 UTC (rev 99666)
@@ -114,4 +114,6 @@
m_source->stopUpdates();
}
+#include "moc_WebGeoLocationProviderQt.cpp"
+
#endif // ENABLE(GEOLOCATION)
Modified: trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h (99665 => 99666)
--- trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2011-11-09 08:52:43 UTC (rev 99666)
@@ -29,6 +29,8 @@
class QGeoPositionInfoSource;
class QGeoPositionInfo;
+#if ENABLE(GEOLOCATION)
+
class WebGeolocationProviderQt : public QObject {
Q_OBJECT
public:
@@ -53,4 +55,6 @@
mutable QGeoPositionInfoSource* m_source;
};
+#endif
+
#endif /* WebGeolocationProviderQt_h */
Modified: trunk/Tools/ChangeLog (99665 => 99666)
--- trunk/Tools/ChangeLog 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Tools/ChangeLog 2011-11-09 08:52:43 UTC (rev 99666)
@@ -1,3 +1,15 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Build system cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=71815
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * WebKitTestRunner/InjectedBundle/Target.pri: We don't need to link against the webkit2
+ static library.
+ * qmake/mkspecs/features/_javascript_core.prf: The wtf sources pull in a glib dependency
+ (ownPtr functions for glib types). Propagate that to everyone using _javascript_core.
+
2011-11-08 Hayato Ito <[email protected]>
[NRWT] Make single_test_runner aware of reference filename of test_input.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (99665 => 99666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-09 08:52:43 UTC (rev 99666)
@@ -47,7 +47,7 @@
load(features)
load(webcore)
-CONFIG += _javascript_core webkit2 qtwebkit
+CONFIG += _javascript_core qtwebkit
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/_javascript_core.prf (99665 => 99666)
--- trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-11-09 08:51:00 UTC (rev 99665)
+++ trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-11-09 08:52:43 UTC (rev 99666)
@@ -67,6 +67,13 @@
INCLUDEPATH += $$_javascript_CORE_SOURCE_DIR/os-win32
}
+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
+ }
+}
+
config_step {
pathToJavaScriptCoreOutput = $$buildDirForSource(Source/_javascript_Core)/$$_javascript_CORE_DESTDIR
