diff --git a/src/phrases/abstractfieldphrase.h b/src/phrases/abstractfieldphrase.h index 992e441..72b18d4 100644 --- a/src/phrases/abstractfieldphrase.h +++ b/src/phrases/abstractfieldphrase.h @@ -10,7 +10,7 @@ NUT_BEGIN_NAMESPACE class PhraseData; -class AbstractFieldPhrase +class NUT_EXPORT AbstractFieldPhrase { public: PhraseData *data; diff --git a/src/phrases/assignmentphrase.h b/src/phrases/assignmentphrase.h index d1bd290..31ab759 100644 --- a/src/phrases/assignmentphrase.h +++ b/src/phrases/assignmentphrase.h @@ -9,7 +9,7 @@ NUT_BEGIN_NAMESPACE class PhraseData; class AbstractFieldPhrase; -class AssignmentPhrase +class NUT_EXPORT AssignmentPhrase { public: PhraseData *data; diff --git a/src/phrases/assignmentphraselist.h b/src/phrases/assignmentphraselist.h index 48399d5..816a033 100644 --- a/src/phrases/assignmentphraselist.h +++ b/src/phrases/assignmentphraselist.h @@ -7,7 +7,7 @@ NUT_BEGIN_NAMESPACE class PhraseData; class AssignmentPhrase; -class AssignmentPhraseList +class NUT_EXPORT AssignmentPhraseList { public: QList data; diff --git a/src/phrases/conditionalphrase.h b/src/phrases/conditionalphrase.h index 4e35da1..51355a6 100644 --- a/src/phrases/conditionalphrase.h +++ b/src/phrases/conditionalphrase.h @@ -13,7 +13,7 @@ ConditionalPhrase operator op(const QVariant &other) \ { \ return ConditionalPhrase(this, cond, other); \ } -class ConditionalPhrase +class NUT_EXPORT ConditionalPhrase { public: PhraseData *data; diff --git a/src/phrases/datephrase.h b/src/phrases/datephrase.h index 3427375..4b36dda 100644 --- a/src/phrases/datephrase.h +++ b/src/phrases/datephrase.h @@ -46,7 +46,7 @@ template <> inline bool is_valid_template() {return true;} template -class FieldPhrase::value>::type> +class NUT_EXPORT FieldPhrase::value>::type> : public AbstractFieldPhrase { public: diff --git a/src/phrases/fieldphrase.h b/src/phrases/fieldphrase.h index 18a75e3..7caff64 100644 --- a/src/phrases/fieldphrase.h +++ b/src/phrases/fieldphrase.h @@ -8,7 +8,7 @@ NUT_BEGIN_NAMESPACE template -class FieldPhrase : public AbstractFieldPhrase +class NUT_EXPORT FieldPhrase : public AbstractFieldPhrase { public: FieldPhrase(const char *className, const char *s) : @@ -27,7 +27,7 @@ public: template<> -class FieldPhrase : public AbstractFieldPhrase +class NUT_EXPORT FieldPhrase : public AbstractFieldPhrase { public: FieldPhrase(const char *className, const char *s) : @@ -102,7 +102,7 @@ public: } template<> -class FieldPhrase : public AbstractFieldPhrase +class NUT_EXPORT FieldPhrase : public AbstractFieldPhrase { public: FieldPhrase(const char *className, const char *s) : diff --git a/src/phrases/phrasedata.h b/src/phrases/phrasedata.h index 18901a6..3d64d30 100644 --- a/src/phrases/phrasedata.h +++ b/src/phrases/phrasedata.h @@ -5,7 +5,7 @@ NUT_BEGIN_NAMESPACE -class PhraseData +class NUT_EXPORT PhraseData { public: enum Condition { diff --git a/src/phrases/phrasedatalist.h b/src/phrases/phrasedatalist.h index 76cd437..c001f8c 100644 --- a/src/phrases/phrasedatalist.h +++ b/src/phrases/phrasedatalist.h @@ -5,7 +5,7 @@ NUT_BEGIN_NAMESPACE -class PhraseDataList : public QList +class NUT_EXPORT PhraseDataList : public QList { public: PhraseDataList(); diff --git a/src/phrases/phraselist.h b/src/phrases/phraselist.h index 7023b47..22dd1c4 100644 --- a/src/phrases/phraselist.h +++ b/src/phrases/phraselist.h @@ -8,7 +8,8 @@ NUT_BEGIN_NAMESPACE class AbstractFieldPhrase; -class PhraseList{ +class NUT_EXPORT PhraseList +{ public: bool isValid; PhraseDataList data; diff --git a/src/src.pro b/src/src.pro index 8c9040f..1f8254c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,8 +4,9 @@ QT -= gui TARGET = nut TEMPLATE = lib CONFIG += c++11 +CONFIG += staticlib -DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += QT_DEPRECATED_WARNINGS NUT_COMPILE_STATIC HEADERS += \ $$PWD/generators/sqlgeneratorbase_p.h \ diff --git a/test/common/nut-lib.pri b/test/common/nut-lib.pri new file mode 100644 index 0000000..92535e9 --- /dev/null +++ b/test/common/nut-lib.pri @@ -0,0 +1,19 @@ + +win32 { +# CONFIG(debug,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../src/debug) +# CONFIG(release,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../src/release) +} else { +# CONFIG(debug,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../debug) +# CONFIG(release,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../release) +} + +#LIBS += -l$$OUT_PWD/../../src/debug/nut + +INCLUDEPATH += $$PWD/../../src $$PWD/../common + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-nut-Desktop_Qt_5_12_0_MSVC2015_64bit-Debug/src/release/ -lnut +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-nut-Desktop_Qt_5_12_0_MSVC2015_64bit-Debug/src/debug/ -lnut +else:unix: LIBS += -L$$PWD/../../../build-nut-Desktop_Qt_5_12_0_MSVC2015_64bit-Debug/src/ -lnut + +INCLUDEPATH += $$PWD/../../include +DEPENDPATH += $$PWD/../../include diff --git a/test/tst_basic/tst_basic.pro b/test/tst_basic/tst_basic.pro index 7625a11..8f8dd06 100644 --- a/test/tst_basic/tst_basic.pro +++ b/test/tst_basic/tst_basic.pro @@ -5,9 +5,9 @@ TARGET = tst_nut TEMPLATE = app CONFIG += warn_on c++11 -INCLUDEPATH += $$PWD/../../src $$PWD/../common -include(../../nut.pri) -IMPORTPATH += $$OUT_PWD/../src/imports + +include(../common/nut-lib.pri) + SOURCES += \ ../common/comment.cpp \ ../common/post.cpp \ diff --git a/test/tst_benckmark/tst_benckmark.pro b/test/tst_benckmark/tst_benckmark.pro index 5bf6051..dc55609 100644 --- a/test/tst_benckmark/tst_benckmark.pro +++ b/test/tst_benckmark/tst_benckmark.pro @@ -5,9 +5,9 @@ TARGET = tst_benchmark TEMPLATE = app CONFIG += warn_on c++11 -INCLUDEPATH += $$PWD/../../src $$PWD/../common -include(../../nut.pri) -IMPORTPATH += $$OUT_PWD/../src/imports + +include(../common/nut-lib.pri) + SOURCES += \ ../common/comment.cpp \ ../common/post.cpp \ diff --git a/test/tst_generators/tst_generators.pro b/test/tst_generators/tst_generators.pro index 7cd9a4b..ed4d9f2 100644 --- a/test/tst_generators/tst_generators.pro +++ b/test/tst_generators/tst_generators.pro @@ -6,9 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app -INCLUDEPATH += $$PWD/../../src $$PWD/../common -include(../../nut.pri) -IMPORTPATH += $$OUT_PWD/../src/imports +include(../common/nut-lib.pri) SOURCES += \ tst_generators.cpp diff --git a/test/tst_phrases/tst_phrases.pro b/test/tst_phrases/tst_phrases.pro index 78e0a47..504746b 100644 --- a/test/tst_phrases/tst_phrases.pro +++ b/test/tst_phrases/tst_phrases.pro @@ -5,9 +5,9 @@ TARGET = tst_phrases TEMPLATE = app CONFIG += warn_on c++11 -INCLUDEPATH += $$PWD/../../src $$PWD/../common -include(../../nut.pri) -IMPORTPATH += $$OUT_PWD/../src/imports + +include(../common/nut-lib.pri) + SOURCES += \ tst_phrases.cpp diff --git a/test/tst_upgrades/db1.h b/test/tst_upgrades/db1.h index 0a8d915..0f7e74b 100644 --- a/test/tst_upgrades/db1.h +++ b/test/tst_upgrades/db1.h @@ -1,7 +1,8 @@ #ifndef DB1_H #define DB1_H -#include +#include "database.h" + class Table1; class DB1 : public Nut::Database diff --git a/test/tst_upgrades/db2.h b/test/tst_upgrades/db2.h index 4049861..5f72875 100644 --- a/test/tst_upgrades/db2.h +++ b/test/tst_upgrades/db2.h @@ -1,7 +1,8 @@ #ifndef DB2_H #define DB2_H -#include +#include "database.h" + class Table2; class DB2 : public Nut::Database diff --git a/test/tst_upgrades/db3.h b/test/tst_upgrades/db3.h index eae13ad..018a4d7 100644 --- a/test/tst_upgrades/db3.h +++ b/test/tst_upgrades/db3.h @@ -1,7 +1,8 @@ #ifndef DB3_H #define DB3_H -#include +#include "database.h" + class Table3; class DB3 : public Nut::Database diff --git a/test/tst_upgrades/tst_upgrades.pro b/test/tst_upgrades/tst_upgrades.pro index 2756cf3..8b8b636 100644 --- a/test/tst_upgrades/tst_upgrades.pro +++ b/test/tst_upgrades/tst_upgrades.pro @@ -5,9 +5,8 @@ TARGET = tst_upgrades TEMPLATE = app CONFIG += warn_on c++11 -INCLUDEPATH += $$PWD/../../src $$PWD/../common -include(../../nut.pri) -IMPORTPATH += $$OUT_PWD/../src/imports + +include(../common/nut-lib.pri) SOURCES += tst_upgrades.cpp \ db1.cpp \