diff --git a/3rdparty/serializer b/3rdparty/serializer index b3c550c..1d3495b 160000 --- a/3rdparty/serializer +++ b/3rdparty/serializer @@ -1 +1 @@ -Subproject commit b3c550c5bb7c570b1b10492fcedf287c1915af39 +Subproject commit 1d3495bed909392cdf128e8ef6f8b3986b2c09b5 diff --git a/test/common/nut-lib.pri b/test/common/nut-lib.pri index 92535e9..d7bae5a 100644 --- a/test/common/nut-lib.pri +++ b/test/common/nut-lib.pri @@ -1,19 +1,11 @@ win32 { -# CONFIG(debug,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../src/debug) -# CONFIG(release,debug|release): DESTDIR = $$absolute_path($$OUT_PWD/../../src/release) + CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug) + CONFIG(release,debug|release): LIBDIR = $$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) + CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../debug) + CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../release) } - -#LIBS += -l$$OUT_PWD/../../src/debug/nut +LIBS += -L$$LIBDIR -lnut 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_phrases/tst_phrases.cpp b/test/tst_phrases/tst_phrases.cpp index cca7753..ba5e0d2 100644 --- a/test/tst_phrases/tst_phrases.cpp +++ b/test/tst_phrases/tst_phrases.cpp @@ -110,6 +110,18 @@ void MainTest::extra() auto p2 = url == "http://google.com"; } +void MainTest::mix() +{ + FieldPhrase id("", ""); + FieldPhrase name("", ""); + FieldPhrase lastName("", ""); + FieldPhrase birthDate("", ""); + + select(id | name | lastName); +// update((name = "john") | (lastName = "snow")); + +} + void MainTest::select(const PhraseList &ph) { diff --git a/test/tst_quuid/testdatabase.h b/test/tst_quuid/testdatabase.h index 1e257e6..1fa20d2 100644 --- a/test/tst_quuid/testdatabase.h +++ b/test/tst_quuid/testdatabase.h @@ -1,7 +1,7 @@ #ifndef TESTDATABASE_H #define TESTDATABASE_H -#include +#include "database.h" class Test; class TestDatabase : public Nut::Database