New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

1 files changed, 9 insertions, 19 deletions

diff --git a/Plugins/DbSqliteSystemData/DbSqliteSystemData.pro b/Plugins/DbSqliteSystemData/DbSqliteSystemData.pro
index caa4784..4b83668 100644
--- a/Plugins/DbSqliteSystemData/DbSqliteSystemData.pro
+++ b/Plugins/DbSqliteSystemData/DbSqliteSystemData.pro
@@ -15,33 +15,23 @@ TEMPLATE = lib
 

 SOURCES += dbsqlitesystemdata.cpp \

     dbsqlitesystemdatainstance.cpp \

-    systemdata_sqlite3.c

+    systemdata_interop.c

 

 HEADERS += dbsqlitesystemdata.h \

     dbsqlitesystemdata_global.h \

     dbsqlitesystemdatainstance.h \

-    systemdata_sqlite3.h

+    systemdata_interop.h

 

 DISTFILES += DbSqliteSystemData.json

 

-!macx: {

-    LIBS += -L$${PWD}/../deps/lib/$${PLATFORM}/

-}

-win32: {

-    INCLUDEPATH += $${PWD}/../deps/include/$${PLATFORM}/

-    DEPENDPATH += $${PWD}/../deps/include/$${PLATFORM}/

-    LIBS += -lcoreSQLiteStudio

-}

-

-unix: {

-    DEFINES += SQLITE_OS_UNIX=1

-}

-win32: {

-    DEFINES += SQLITE_OS_WIN=1

-}

-DEFINES += SQLITE_HAS_CODEC SQLITE_ALLOW_XTHREAD_CONNECT=1 SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 \

+INCLUDEPATH += $${PWD}/../deps/include/$${PLATFORM}/

+DEPENDPATH += $${PWD}/../deps/include/$${PLATFORM}/

+LIBS += -lcoreSQLiteStudio

+

+DEFINES += SQLITE_OS_WIN=1 SQLITE_HAS_CODEC SQLITE_ALLOW_XTHREAD_CONNECT=1 SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 \

     SQLITE_CORE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE USE_DYNAMIC_SQLITE3_LOAD=0 \

-    HAVE_ACOSH=1 HAVE_ASINH=1 HAVE_ATANH=1 HAVE_ISBLANK=1

+    HAVE_ACOSH=1 HAVE_ASINH=1 HAVE_ATANH=1 HAVE_ISBLANK=1 SQLITE_ENABLE_COLUMN_METADATA=1 SQLITE_ENABLE_LOAD_EXTENSION=1 \

+    INTEROP_CODEC=1 INTEROP_EXTENSION_FUNCTIONS=1

 

 QMAKE_CFLAGS_WARN_ON = -Wall -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-but-set-variable -Wno-parentheses