diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-03-22 15:58:19 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-04-01 11:26:10 +0000 |
commit | 3b4c850361abbc2aae556dbf99c8e4c8086ae569 (patch) | |
tree | e04d32444f884c1ac617d2117ac5b3d866629dff | |
parent | 7205faf1a546a690f68176989100109e9a3335b7 (diff) | |
download | qtwebkit-3b4c850361abbc2aae556dbf99c8e4c8086ae569.tar.gz |
Allow using system SQLite without pkg-config
Change-Id: Ifff0f8877a2d2d77a04468c205c3353f043e7738
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r-- | Source/WebCore/WebCore.pri | 2 | ||||
-rw-r--r-- | Tools/qmake/config.tests/libsqlite3/libsqlite3.cpp | 34 | ||||
-rw-r--r-- | Tools/qmake/config.tests/libsqlite3/libsqlite3.pro | 5 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 2 |
4 files changed, 41 insertions, 2 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index ffe389d46..01893948e 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -233,7 +233,7 @@ use?(GRAPHICS_SURFACE) { } have?(sqlite3) { - mac { + osx|contains(QT_CONFIG, no-pkg-config) { LIBS += -lsqlite3 } else { PKGCONFIG += sqlite3 diff --git a/Tools/qmake/config.tests/libsqlite3/libsqlite3.cpp b/Tools/qmake/config.tests/libsqlite3/libsqlite3.cpp new file mode 100644 index 000000000..34434d195 --- /dev/null +++ b/Tools/qmake/config.tests/libsqlite3/libsqlite3.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2016 Konstantin Tokavev <annulen@yandex.ru> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sqlite3.h> + +int main(int, char**) +{ + sqlite3 *db; + sqlite3_open("data.db", &db); + sqlite3_close(db); + return 0; +} diff --git a/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro b/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro new file mode 100644 index 000000000..2c39c5266 --- /dev/null +++ b/Tools/qmake/config.tests/libsqlite3/libsqlite3.pro @@ -0,0 +1,5 @@ +SOURCES = libsqlite3.cpp +OBJECTS_DIR = obj +LIBS += -lsqlite3 + +load(qt_build_config) diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 7b0b49d90..6a9e9a219 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -117,7 +117,7 @@ defineTest(detectFeatures) { } # Try to use an system wide SQlite installation - if(!contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3"))|mac { + if(!contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3"))|config_libsqlite3 { WEBKIT_CONFIG += have_sqlite3 } else { SQLITE3SRCDIR = $$(SQLITE3SRCDIR) |