diff --git a/sqliter/sqliter.h b/sqliter/sqliter.h --- a/sqliter/sqliter.h +++ b/sqliter/sqliter.h @@ -1,29 +1,29 @@ #ifndef SQLITER_H #define SQLITER_H #include <QVariant> #if defined (SQLITER_STATIC) -# define SQLITER_EXPORT +# define SQLITERSHARED_EXPORT #elif defined(SQLITER_LIBRARY) # define SQLITERSHARED_EXPORT Q_DECL_EXPORT #else # define SQLITERSHARED_EXPORT Q_DECL_IMPORT #endif struct sqlite3_context; struct sqlite3_value; class SQLITERSHARED_EXPORT Sqliter { public: static bool install(QVariant a_driverHandle); private: Sqliter() = default; static void upper(sqlite3_context* a_context, int a_argc, sqlite3_value** a_argv); static void lower(sqlite3_context* a_context, int a_argc, sqlite3_value** a_argv); static int compareNocase8(void* a_pArg, int a_size1, const void* a_data1, int a_size2, const void* a_data2); static int compareNocase16(void* a_pArg, int a_size1, const void* a_data1, int a_size2, const void* a_data2); }; #endif // SQLITER_H diff --git a/tests/tests.pro b/tests/tests.pro --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,42 +1,45 @@ #------------------------------------------------- # # Project created by QtCreator 2018-03-22T16:40:26 # #------------------------------------------------- TEMPLATE = app TARGET = sqrtest QT += testlib sql QT -= gui -CONFIG += console +CONFIG += console testcase CONFIG -= app_bundle -CONFIG(staticlib): DEFINES += SQLITER_STATIC # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the # deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 SOURCES += sqrtest.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../sqliter/release/ else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../sqliter/debug/ else:mac:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../sqliter/debug/ else:unix: LIBS += -L$$OUT_PWD/../sqliter/ LIBS += -lsqliter +CONFIG(staticlib) { + DEFINES += SQLITER_STATIC + LIBS += -lsqlite3 +} INCLUDEPATH += $$PWD/../sqliter DEPENDPATH += $$PWD/../sqliter INSTALLS -= target