Title: [137316] trunk/Source/WebCore
- Revision
- 137316
- Author
- [email protected]
- Date
- 2012-12-11 07:57:34 -0800 (Tue, 11 Dec 2012)
Log Message
Unreviewed Qt build fix: Don't error out if SQLITE3SRCDIR isn't set but
we have a system sqlite to use.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137315 => 137316)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 15:50:09 UTC (rev 137315)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 15:57:34 UTC (rev 137316)
@@ -1,3 +1,10 @@
+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.
+
+ * WebCore.pri:
+
2012-12-11 Oswald Buddenhagen <[email protected]>
[Qt] make qtbase source requirement explicit
Modified: trunk/Source/WebCore/WebCore.pri (137315 => 137316)
--- trunk/Source/WebCore/WebCore.pri 2012-12-11 15:50:09 UTC (rev 137315)
+++ trunk/Source/WebCore/WebCore.pri 2012-12-11 15:57:34 UTC (rev 137316)
@@ -235,7 +235,7 @@
}
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
-isEmpty(SQLITE3SRCDIR) {
+!system-sqlite:isEmpty(SQLITE3SRCDIR) {
isEmpty(_QMAKE_SUPER_CACHE_): \
error("Set $SQLITE3SRCDIR or build WebKit under qt5.git.")
SQLITE3SRCDIR = ../../../qtbase/src/3rdparty/sqlite/
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
