Title: [137446] trunk
- Revision
- 137446
- Author
- hausm...@webkit.org
- Date
- 2012-12-12 03:21:53 -0800 (Wed, 12 Dec 2012)
Log Message
[Qt] Fix build on Mac
Reviewed by Csaba Osztrogonác.
On Mac OS X we have sqlite as a system library available.
Source/WebCore:
* WebCore.pri:
Tools:
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137445 => 137446)
--- trunk/Source/WebCore/ChangeLog 2012-12-12 11:12:21 UTC (rev 137445)
+++ trunk/Source/WebCore/ChangeLog 2012-12-12 11:21:53 UTC (rev 137446)
@@ -1,5 +1,15 @@
2012-12-12 Simon Hausmann <simon.hausm...@digia.com>
+ [Qt] Fix build on Mac
+
+ Reviewed by Csaba Osztrogonác.
+
+ On Mac OS X we have sqlite as a system library available.
+
+ * WebCore.pri:
+
+2012-12-12 Simon Hausmann <simon.hausm...@digia.com>
+
[Qt] Fix linkage against SQLite
https://bugs.webkit.org/show_bug.cgi?id=104781
Modified: trunk/Source/WebCore/WebCore.pri (137445 => 137446)
--- trunk/Source/WebCore/WebCore.pri 2012-12-12 11:12:21 UTC (rev 137445)
+++ trunk/Source/WebCore/WebCore.pri 2012-12-12 11:21:53 UTC (rev 137446)
@@ -235,7 +235,11 @@
}
have?(sqlite3) {
- PKGCONFIG += sqlite3
+ mac {
+ LIBS += -lsqlite3
+ } else
+ PKGCONFIG += sqlite3
+ }
} else {
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
isEmpty(SQLITE3SRCDIR): SQLITE3SRCDIR = ../../../qtbase/src/3rdparty/sqlite/
Modified: trunk/Tools/ChangeLog (137445 => 137446)
--- trunk/Tools/ChangeLog 2012-12-12 11:12:21 UTC (rev 137445)
+++ trunk/Tools/ChangeLog 2012-12-12 11:21:53 UTC (rev 137446)
@@ -1,3 +1,13 @@
+2012-12-12 Simon Hausmann <simon.hausm...@digia.com>
+
+ [Qt] Fix build on Mac
+
+ Reviewed by Csaba Osztrogonác.
+
+ On Mac OS X we have sqlite as a system library available.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-12-12 Zan Dobersek <zandober...@gmail.com>
Unreviewed GTK gardening.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (137445 => 137446)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-12-12 11:12:21 UTC (rev 137445)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-12-12 11:21:53 UTC (rev 137446)
@@ -121,7 +121,7 @@
}
# Try to use an system wide SQlite installation
- !contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3") {
+ if(!contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3"))|mac {
WEBKIT_CONFIG += have_sqlite3
} else {
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
