CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include lib in tests [skip ci]

This commit is contained in:
Hamed.Masafi 2019-02-26 19:37:14 +03:30
parent 9c182ea7f2
commit d5487966dc
19 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phrases/abstractfieldphrase.h
View File

@ -10,7 +10,7 @@
NUT_BEGIN_NAMESPACE
class PhraseData;
class AbstractFieldPhrase
class NUT_EXPORT AbstractFieldPhrase
{
public:
PhraseData *data;

2
src/phrases/assignmentphrase.h
View File

@ -9,7 +9,7 @@ NUT_BEGIN_NAMESPACE
class PhraseData;
class AbstractFieldPhrase;
class AssignmentPhrase
class NUT_EXPORT AssignmentPhrase
{
public:
PhraseData *data;

2
src/phrases/assignmentphraselist.h
View File

@ -7,7 +7,7 @@ NUT_BEGIN_NAMESPACE
class PhraseData;
class AssignmentPhrase;
class AssignmentPhraseList
class NUT_EXPORT AssignmentPhraseList
{
public:
QList<PhraseData*> data;

2
src/phrases/conditionalphrase.h
View File

@ -13,7 +13,7 @@ ConditionalPhrase operator op(const QVariant &other) \
{ \
return ConditionalPhrase(this, cond, other); \
}
class ConditionalPhrase
class NUT_EXPORT ConditionalPhrase
{
public:
PhraseData *data;

2
src/phrases/datephrase.h
View File

@ -46,7 +46,7 @@ template <>
inline bool is_valid_template<QTime, QTime>() {return true;}
template <typename T>
class FieldPhrase<T, typename std::enable_if<is_date<T>::value>::type>
class NUT_EXPORT FieldPhrase<T, typename std::enable_if<is_date<T>::value>::type>
: public AbstractFieldPhrase
{
public:

6
src/phrases/fieldphrase.h
View File

@ -8,7 +8,7 @@
NUT_BEGIN_NAMESPACE
template<typename T, typename enable = void>
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<QString> : public AbstractFieldPhrase
class NUT_EXPORT FieldPhrase<QString> : public AbstractFieldPhrase
{
public:
FieldPhrase(const char *className, const char *s) :
@ -102,7 +102,7 @@ public:
}
template<>
class FieldPhrase<bool> : public AbstractFieldPhrase
class NUT_EXPORT FieldPhrase<bool> : public AbstractFieldPhrase
{
public:
FieldPhrase(const char *className, const char *s) :

2
src/phrases/phrasedata.h
View File

@ -5,7 +5,7 @@
NUT_BEGIN_NAMESPACE
class PhraseData
class NUT_EXPORT PhraseData
{
public:
enum Condition {

2
src/phrases/phrasedatalist.h
View File

@ -5,7 +5,7 @@
NUT_BEGIN_NAMESPACE
class PhraseDataList : public QList<PhraseData*>
class NUT_EXPORT PhraseDataList : public QList<PhraseData*>
{
public:
PhraseDataList();

3
src/phrases/phraselist.h
View File

@ -8,7 +8,8 @@
NUT_BEGIN_NAMESPACE
class AbstractFieldPhrase;
class PhraseList{
class NUT_EXPORT PhraseList
{
public:
bool isValid;
PhraseDataList data;

3
src/src.pro
View File

@ -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 \

19
test/common/nut-lib.pri Normal file
View File

@ -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

6
test/tst_basic/tst_basic.pro
View File

@ -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 \

6
test/tst_benckmark/tst_benckmark.pro
View File

@ -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 \

4
test/tst_generators/tst_generators.pro
View File

@ -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

6
test/tst_phrases/tst_phrases.pro
View File

@ -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

3
test/tst_upgrades/db1.h
View File

@ -1,7 +1,8 @@
#ifndef DB1_H
#define DB1_H
#include <Database>
#include "database.h"
class Table1;
class DB1 : public Nut::Database

3
test/tst_upgrades/db2.h
View File

@ -1,7 +1,8 @@
#ifndef DB2_H
#define DB2_H
#include <Database>
#include "database.h"
class Table2;
class DB2 : public Nut::Database

3
test/tst_upgrades/db3.h
View File

@ -1,7 +1,8 @@
#ifndef DB3_H
#define DB3_H
#include <Database>
#include "database.h"
class Table3;
class DB3 : public Nut::Database

5
test/tst_upgrades/tst_upgrades.pro
View File

@ -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 \