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

check travis

This commit is contained in:
Hamed Masafi 2019-02-26 23:21:29 +03:30
parent deba877e48
commit b22f72374a
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/serializer vendored

@ -1 +1 @@
Subproject commit b3c550c5bb7c570b1b10492fcedf287c1915af39
Subproject commit 1d3495bed909392cdf128e8ef6f8b3986b2c09b5

18
test/common/nut-lib.pri
View File

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

12
test/tst_phrases/tst_phrases.cpp
View File

@ -110,6 +110,18 @@ void MainTest::extra()
auto p2 = url == "http://google.com";
}
void MainTest::mix()
{
FieldPhrase<int> id("", "");
FieldPhrase<QString> name("", "");
FieldPhrase<QString> lastName("", "");
FieldPhrase<QDate> birthDate("", "");
select(id | name | lastName);
// update((name = "john") | (lastName = "snow"));
}
void MainTest::select(const PhraseList &ph)
{

2
test/tst_quuid/testdatabase.h
View File

@ -1,7 +1,7 @@
#ifndef TESTDATABASE_H
#define TESTDATABASE_H
#include <Database>
#include "database.h"
class Test;
class TestDatabase : public Nut::Database