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

qbs file fixed

This commit is contained in:
Hamed Masafi 2018-07-14 17:07:53 +04:30
parent cd1bf90608
commit 90be3ad9de
4 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
nut.qbs
View File

@ -1,39 +1,53 @@
import qbs import qbs
Product { Project {
type: "staticlibrary" // StaticLibrary {
name: "nut" // name: "nut_static"
Depends { name: 'cpp' } // files: [
Depends { name: "Qt.core" } // "src/*.h",
Depends { name: "Qt.sql" } // "src/*.cpp",
// "src/generators/*.h",
// "src/generators/*.cpp"
// ]
// Depends { name: 'cpp' }
// Depends { name: "Qt.core" }
// Depends { name: "Qt.sql" }
// Group { qbs.install: true; fileTagsFilter: product.type;}
Export { // Export {
Depends { name: "cpp" } // Depends { name: "cpp" }
// Depends { name: "Qt.core" }
// Depends { name: "Qt.sql" }
// cpp.includePaths: [
// product.sourceDirectory + "/src",
// product.sourceDirectory + "/include"
// ]
// }
// }
DynamicLibrary {
name: "nut"
files: [
"src/*.h",
"src/*.cpp",
"src/generators/*.h",
"src/generators/*.cpp"
]
Depends { name: 'cpp' }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
Depends { name: "Qt.sql" } Depends { name: "Qt.sql" }
cpp.includePaths: [
product.sourceDirectory + "/src",
product.sourceDirectory + "/include"
]
}
files: [ Group { qbs.install: true; fileTagsFilter: product.type;}
"src/tableset.cpp",
"src/query.cpp", Export {
"src/databasemodel.cpp", Depends { name: "cpp" }
"src/tablesetbase.cpp", Depends { name: "Qt.core" }
"src/changelogtable.cpp", Depends { name: "Qt.sql" }
"src/querybase.cpp", cpp.includePaths: [
"src/tablemodel.cpp", product.sourceDirectory + "/src",
"src/wherephrase.cpp", product.sourceDirectory + "/include"
"src/table.cpp", ]
"src/database.cpp", }
"src/generators/sqlgeneratorbase.cpp", }
"src/generators/postgresqlgenerator.cpp",
"src/generators/mysqlgenerator.cpp",
"src/generators/sqlitegenerator.cpp",
"src/generators/sqlservergenerator.cpp",
"src/types/dbgeography.cpp",
"src/serializableobject.cpp"
]
} }

8
src/phrase.cpp
View File

@ -477,7 +477,7 @@ ConditionalPhrase ConditionalPhrase::operator ==(const QVariant &other)
// const_cast<ConditionalPhrase&>(other)); // const_cast<ConditionalPhrase&>(other));
//} //}
#define DECLARE_CONDITIONALPHRASE_OPERATORS(op, cond) \ #define DECLARE_CONDITIONALPHRASE_OPERATORS_IMPL(op, cond) \
ConditionalPhrase operator op(const ConditionalPhrase &l, \ ConditionalPhrase operator op(const ConditionalPhrase &l, \
const ConditionalPhrase &r) \ const ConditionalPhrase &r) \
{ \ { \
@ -526,9 +526,9 @@ ConditionalPhrase operator op(ConditionalPhrase &&l, ConditionalPhrase &&r) \
return p; \ return p; \
} }
DECLARE_CONDITIONALPHRASE_OPERATORS(==, PhraseData::Equal) DECLARE_CONDITIONALPHRASE_OPERATORS_IMPL(==, PhraseData::Equal)
DECLARE_CONDITIONALPHRASE_OPERATORS(||, PhraseData::Or) DECLARE_CONDITIONALPHRASE_OPERATORS_IMPL(||, PhraseData::Or)
DECLARE_CONDITIONALPHRASE_OPERATORS(&&, PhraseData::And) DECLARE_CONDITIONALPHRASE_OPERATORS_IMPL(&&, PhraseData::And)
ConditionalPhrase ConditionalPhrase::operator !() ConditionalPhrase ConditionalPhrase::operator !()
{ {

5
src/tableset.h
View File

@ -21,10 +21,10 @@
#ifndef TABLESET_H #ifndef TABLESET_H
#define TABLESET_H #define TABLESET_H
#include <QtCore/qglobal.h> #include <QtCore/QtGlobal>
#include <QtCore/QVariant>
#include <QtCore/QMetaMethod> #include <QtCore/QMetaMethod>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtCore/QVariant>
#include <QtSql/QSqlQuery> #include <QtSql/QSqlQuery>
#include "tablesetbase_p.h" #include "tablesetbase_p.h"
@ -52,6 +52,7 @@ public:
int length() const; int length() const;
T *at(int i) const; T *at(int i) const;
const T &operator[](int i) const; const T &operator[](int i) const;
Query<T> *query(); Query<T> *query();
Query<T> *query(bool autoDelete); Query<T> *query(bool autoDelete);
}; };

6
test/common/consts.h
View File

@ -1,6 +1,12 @@
#ifndef CONSTS_H #ifndef CONSTS_H
#define CONSTS_H #define CONSTS_H
#define PRINT(x) qDebug() << #x "=" << x;
#define TIC() QElapsedTimer timer; timer.start()
#define TOC() qDebug() << QString("Elapsed time: %1ms for %2") \
.arg(timer.elapsed() / 1000.) \
.arg(__func__)
//#define DRIVER "QPSQL" //#define DRIVER "QPSQL"
//#define HOST "127.0.0.1" //#define HOST "127.0.0.1"
//#define DATABASE "nutdb2" //#define DATABASE "nutdb2"