diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 15:59:00 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 16:54:46 +0200 |
| commit | 6b7df60a752422b1f6ff07bb2682c21e18a43985 (patch) | |
| tree | 3e56bd3f4ee34a228777d00ff328ef1c53cb1df1 /src/imports/jsondb-listmodel/jsondb-listmodel.pro | |
| parent | 20549eedb5b5e852c0e384cd76bfbff14168dbda (diff) | |
| parent | 7ef36e3c5a88560eb4e3a81c2c9f14059739108b (diff) | |
Merge remote-tracking branch 'gerrit/master' into hbtreehbtree
Conflicts:
src/daemon/daemon.pri
src/daemon/jsondbview.cpp
src/partition/jsondbindex.cpp
src/partition/jsondbindex.h
src/partition/jsondbindexquery.h
src/partition/jsondbmanagedbtree.cpp
src/partition/jsondbmanagedbtree.h
src/partition/jsondbmanagedbtreetxn.cpp
src/partition/jsondbmanagedbtreetxn.h
src/partition/jsondbobjecttable.cpp
src/partition/jsondbobjecttable.h
src/partition/jsondbpartition.cpp
src/partition/jsondbpartition.h
tests/auto/auto.pro
tests/auto/partition/testpartition.cpp
tests/benchmarks/benchmarks.pro
Change-Id: I963adefd6d32fca9b3537981306b67538c759034
Diffstat (limited to 'src/imports/jsondb-listmodel/jsondb-listmodel.pro')
| -rw-r--r-- | src/imports/jsondb-listmodel/jsondb-listmodel.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro index 9e86677..cfa60ad 100644 --- a/src/imports/jsondb-listmodel/jsondb-listmodel.pro +++ b/src/imports/jsondb-listmodel/jsondb-listmodel.pro @@ -18,6 +18,7 @@ INSTALLS += target qmldir qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) QMLTYPESFILE = $$QT.jsondb.imports/$$TARGETPATH/plugin.qmltypes mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump" + unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal" QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondb.libs $$QMLPLUGINDUMP QtAddOn.JsonDb 1.0 $$QT.jsondb.imports > $$QMLTYPESFILE qmltypes.files = $$QMLTYPESFILE @@ -27,19 +28,15 @@ INSTALLS += target qmldir VERSION = 1.0 -include(../../common/common.pri) - HEADERS += \ jsondb-listmodel.h \ jsondb-listmodel_p.h \ jsondb-component.h \ plugin.h -HEADERS += $$QSONCONVERSION_HEADERS - SOURCES += \ jsondb-listmodel.cpp \ jsondb-component.cpp \ plugin.cpp -SOURCES += $$QSONCONVERSION_SOURCES +OTHER_FILES += jsondb.json |