Title: [137313] trunk/Source/WebCore
- Revision
- 137313
- Author
- [email protected]
- Date
- 2012-12-11 07:33:41 -0800 (Tue, 11 Dec 2012)
Log Message
[Qt] make qtbase source requirement explicit
Patch by Oswald Buddenhagen <[email protected]> on 2012-12-11
Reviewed by Simon Hausmann.
getting rid of QT.<module>.sources references, as they don't go well
with real modularization.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137312 => 137313)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 15:30:11 UTC (rev 137312)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 15:33:41 UTC (rev 137313)
@@ -1,5 +1,16 @@
2012-12-11 Oswald Buddenhagen <[email protected]>
+ [Qt] make qtbase source requirement explicit
+
+ Reviewed by Simon Hausmann.
+
+ getting rid of QT.<module>.sources references, as they don't go well
+ with real modularization.
+
+ * WebCore.pri:
+
+2012-12-11 Oswald Buddenhagen <[email protected]>
+
[Qt] move SQLITE3SRCDIR assignment to only use site
Reviewed by Simon Hausmann.
Modified: trunk/Source/WebCore/WebCore.pri (137312 => 137313)
--- trunk/Source/WebCore/WebCore.pri 2012-12-11 15:30:11 UTC (rev 137312)
+++ trunk/Source/WebCore/WebCore.pri 2012-12-11 15:33:41 UTC (rev 137313)
@@ -236,7 +236,9 @@
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
isEmpty(SQLITE3SRCDIR) {
- SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
+ isEmpty(_QMAKE_SUPER_CACHE_): \
+ error("Set $SQLITE3SRCDIR or build WebKit under qt5.git.")
+ SQLITE3SRCDIR = ../../../qtbase/src/3rdparty/sqlite/
}
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
