diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-10-27 14:21:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 16:38:07 +0100 |
| commit | 9ae5d159443c5c7ffdc04e4fd1837a62642765c2 (patch) | |
| tree | a84f9ebc0b8a22994fedd5798bede9fa5066d994 /tools | |
| parent | d876a8867a6f4598ef3fa422554e6f6b3ac515aa (diff) | |
Fixed build for tools/aodbread
Change-Id: Ie1c438c122b04f043ef2bbaa7c7e4a6b1a5e1ddc
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aodbread/aodbread.pro | 14 | ||||
| -rw-r--r-- | tools/aodbread/main.cpp | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/tools/aodbread/aodbread.pro b/tools/aodbread/aodbread.pro index f86af6f1..850ad1aa 100644 --- a/tools/aodbread/aodbread.pro +++ b/tools/aodbread/aodbread.pro @@ -1,19 +1,23 @@ TARGET = aodbread -QT = network declarative testlib +QT = testlib jsondbqson-private CONFIG -= app_bundle CONFIG += debug -include($$PWD/../../src/common/common.pri) - INCLUDEPATH += $$PWD/../../src/daemon LIBS += -L$$QT.jsondb.libs !mac:LIBS += -lssl -lcrypto DEFINES += SRCDIR=\\\"$$PWD/\\\" -include($$PWD/../../src/daemon/daemon.pri) +#include($$PWD/../../src/daemon/daemon.pri) +include($$PWD/../../src/3rdparty/btree/btree.pri) +include($$PWD/../../src/3rdparty/qjson/qjson.pri) + +HEADERS += \ + $$PWD/../../src/daemon/aodb.h SOURCES += \ - main.cpp \ + $$PWD/../../src/daemon/aodb.cpp \ + main.cpp diff --git a/tools/aodbread/main.cpp b/tools/aodbread/main.cpp index d45eb757..9ccd7279 100644 --- a/tools/aodbread/main.cpp +++ b/tools/aodbread/main.cpp @@ -44,12 +44,12 @@ #include "aodb.h" #include "btree.h" -#include "qson/qson.h" -#include "qson/qsonparser.h" +#include <QtJsonDbQson/private/qson_p.h> +#include <QtJsonDbQson/private/qsonparser_p.h> #include "json.h" -Q_USE_JSONDB_NAMESPACE +using namespace QtAddOn::JsonDb; QString printable(const QByteArray &ba) { @@ -209,10 +209,10 @@ int main(int argc, char **argv) QString filename = args.at(0); if (gDumpPage > 0) { - return btree_dump_page(filename.toLocal8Bit().constData(), gDumpPage); + return btree_dump_page_from_file(filename.toLocal8Bit().constData(), gDumpPage); } else if (gDumpPage < 0) { uint32_t page = 1; - while (btree_dump_page(filename.toLocal8Bit().constData(), page)) + while (btree_dump_page_from_file(filename.toLocal8Bit().constData(), page)) ++page; return 1; } |