Title: [137312] trunk
- Revision
- 137312
- Author
- [email protected]
- Date
- 2012-12-11 07:30:11 -0800 (Tue, 11 Dec 2012)
Log Message
[Qt] move SQLITE3SRCDIR assignment to only use site
Patch by Oswald Buddenhagen <[email protected]> on 2012-12-11
Reviewed by Simon Hausmann.
Target.pri includes WebCore.pri the almost first thing, so that is
covered as well.
Source/WebCore:
* WebCore.pri:
Tools:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137311 => 137312)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 15:26:23 UTC (rev 137311)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 15:30:11 UTC (rev 137312)
@@ -1,3 +1,14 @@
+2012-12-11 Oswald Buddenhagen <[email protected]>
+
+ [Qt] move SQLITE3SRCDIR assignment to only use site
+
+ Reviewed by Simon Hausmann.
+
+ Target.pri includes WebCore.pri the almost first thing, so that is
+ covered as well.
+
+ * WebCore.pri:
+
2012-12-11 Eugene Klyuchnikov <[email protected]>
Web Inspector: Timeline: rename "Parse" to "Parse HTML".
Modified: trunk/Source/WebCore/WebCore.pri (137311 => 137312)
--- trunk/Source/WebCore/WebCore.pri 2012-12-11 15:26:23 UTC (rev 137311)
+++ trunk/Source/WebCore/WebCore.pri 2012-12-11 15:30:11 UTC (rev 137312)
@@ -234,6 +234,10 @@
}
}
+SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
+isEmpty(SQLITE3SRCDIR) {
+ SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
+}
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
Modified: trunk/Tools/ChangeLog (137311 => 137312)
--- trunk/Tools/ChangeLog 2012-12-11 15:26:23 UTC (rev 137311)
+++ trunk/Tools/ChangeLog 2012-12-11 15:30:11 UTC (rev 137312)
@@ -1,5 +1,16 @@
2012-12-11 Oswald Buddenhagen <[email protected]>
+ [Qt] move SQLITE3SRCDIR assignment to only use site
+
+ Reviewed by Simon Hausmann.
+
+ Target.pri includes WebCore.pri the almost first thing, so that is
+ covered as well.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
+2012-12-11 Oswald Buddenhagen <[email protected]>
+
[Qt] delete dead include paths
Reviewed by Simon Hausmann.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (137311 => 137312)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-12-11 15:26:23 UTC (rev 137311)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-12-11 15:30:11 UTC (rev 137312)
@@ -100,12 +100,6 @@
contains(QT_CONFIG, build_all): CONFIG += build_all
}
-# Try to locate sqlite3 source (for WebCore)
-SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
-isEmpty(SQLITE3SRCDIR) {
- SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
-}
-
# A newer version of flex is required on Windows. At the moment the only
# one that appears to provide binaries and is not cygwin is winflex.
FLEX = flex
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
