Title: [137317] trunk/Source/WebCore
- Revision
- 137317
- Author
- [email protected]
- Date
- 2012-12-11 08:06:11 -0800 (Tue, 11 Dec 2012)
Log Message
[Qt] Unreviewed, rolling out r137313 and r137316 because they broke the system-sqlite build.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137316 => 137317)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 15:57:34 UTC (rev 137316)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 16:06:11 UTC (rev 137317)
@@ -1,5 +1,11 @@
2012-12-11 Simon Hausmann <[email protected]>
+ [Qt] Unreviewed, rolling out r137313 and r137316 because they broke the system-sqlite build.
+
+ * WebCore.pri:
+
+2012-12-11 Simon Hausmann <[email protected]>
+
Unreviewed Qt build fix: Don't error out if SQLITE3SRCDIR isn't set but
we have a system sqlite to use.
Modified: trunk/Source/WebCore/WebCore.pri (137316 => 137317)
--- trunk/Source/WebCore/WebCore.pri 2012-12-11 15:57:34 UTC (rev 137316)
+++ trunk/Source/WebCore/WebCore.pri 2012-12-11 16:06:11 UTC (rev 137317)
@@ -235,10 +235,8 @@
}
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
-!system-sqlite:isEmpty(SQLITE3SRCDIR) {
- isEmpty(_QMAKE_SUPER_CACHE_): \
- error("Set $SQLITE3SRCDIR or build WebKit under qt5.git.")
- SQLITE3SRCDIR = ../../../qtbase/src/3rdparty/sqlite/
+isEmpty(SQLITE3SRCDIR) {
+ SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
}
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
