diff options
| author | hausmann@webkit.org <hausmann@webkit.org> | 2012-12-12 10:46:55 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-12 13:34:03 +0100 |
| commit | 9437c95e96275264f14bbda0053a34dfad05f052 (patch) | |
| tree | b9b13da277d826386281c48d9a23555c5f8e4e6f /Source | |
| parent | 8c96ffb3b1f8ea0a335dcefb59761fabdd759c52 (diff) | |
| download | qtwebkit-9437c95e96275264f14bbda0053a34dfad05f052.tar.gz | |
Fix linkage against SQLite https://bugs.webkit.org/show_bug.cgi?id=104781
Reviewed by Csaba Osztrogonác.
Detect SQLite either through pkg-config, from the SQLITE3SRCDIR
environment variable or from qtbase via a qt5.git build. Bail out early
with an error message if neither option applies.
This removes the usage of $$QT.core.sources and the dependency on Qt's
system-sqlite configure setting. We should always favour a system
library over a copy in Qt.
Source/WebCore:
* Target.pri:
* WebCore.pri:
Tools:
* qmake/mkspecs/features/features.prf:
Change-Id: Ibd1149749ab3354d6cf8dd9ee22f264257f8f59c
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137444 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/ChangeLog | 18 | ||||
| -rw-r--r-- | Source/WebCore/Target.pri | 2 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 22 |
3 files changed, 30 insertions, 12 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index d812c3aba..26ecec61b 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2012-12-12 Simon Hausmann <simon.hausmann@digia.com> + + [Qt] Fix linkage against SQLite + https://bugs.webkit.org/show_bug.cgi?id=104781 + + Reviewed by Csaba Osztrogonác. + + Detect SQLite either through pkg-config, from the SQLITE3SRCDIR + environment variable or from qtbase via a qt5.git build. Bail out early + with an error message if neither option applies. + + This removes the usage of $$QT.core.sources and the dependency on Qt's + system-sqlite configure setting. We should always favour a system + library over a copy in Qt. + + * Target.pri: + * WebCore.pri: + 2012-12-11 Zeno Albisser <zeno@webkit.org> [Qt][Mac] Fix transparency for WebGL content. diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 4535a46bf..fc9a8959e 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -4054,7 +4054,7 @@ use?(WEBP) { SOURCES += platform/image-decoders/webp/WEBPImageDecoder.cpp } -!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) { +!have?(sqlite3):exists($${SQLITE3SRCDIR}/sqlite3.c) { # Build sqlite3 into WebCore from source # somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro SOURCES += $${SQLITE3SRCDIR}/sqlite3.c diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 5192a1a51..d0dd7cf71 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -231,18 +231,18 @@ use?(GRAPHICS_SURFACE) { } } -SQLITE3SRCDIR = $$(SQLITE3SRCDIR) -isEmpty(SQLITE3SRCDIR) { - 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} - DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE +have?(sqlite3) { + PKGCONFIG += sqlite3 } else { - INCLUDEPATH += $${SQLITE3SRCDIR} - LIBS += -lsqlite3 + SQLITE3SRCDIR = $$(SQLITE3SRCDIR) + isEmpty(SQLITE3SRCDIR): SQLITE3SRCDIR = ../../../qtbase/src/3rdparty/sqlite/ + exists($${SQLITE3SRCDIR}/sqlite3.c) { + INCLUDEPATH += $${SQLITE3SRCDIR} + DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE + } else { + INCLUDEPATH += $${SQLITE3SRCDIR} + LIBS += -lsqlite3 + } } use?(libjpeg): LIBS += -ljpeg |