| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: Ibf9ea22d79b362872075cf219f112bfa5e865b76
|
|
|
|
|
|
|
|
| |
qmake now add CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.
Change-Id: I20c8e552abdc507c3a6a468e7b2740b2c14c0a4b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: I8efef39364a2d2c92cbcfab766831241013abba3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
|
|
|
|
|
| |
Change-Id: I9d24e1d0d0d15da8f4f3995d12ff5b5e793aef12
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
|
|
|
|
|
| |
Change-Id: I2d08fbbd4971bb980a2ed5fa65d38e53d9ba1c32
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
|
|
|
|
|
|
|
| |
This also removed old-style qml api that was using the old c++ api internally.
Change-Id: Iee809bfacb4efeb31e625156420542247354dff7
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I8e8328d8df56e83f13b19858434aeb6e5f888f30
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
| |
for gcc 4.7, this is an error
Change-Id: Ia65da9f5547bab983e20e34f02bdc0c5f37e2270
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
In QtJson's case, it's using old itemviews API in one library and
those cases haven't been ported yet.
Task-number: QTBUG-25053
Change-Id: If732cdc29097fe3a3117b8ed2b392f6f154360ef
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: I739be37d8d9edcd19473d8033ed0fa4879f088ea
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I6e22f8b74d769315d635738dcdef038e61c80e0f
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- pointless CONFIG+=create_prl
- pointless setting of QMAKE_FRAMEWORK_BUNDLE_NAME
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- qmake -project boilerplate
Change-Id: I036d7e737b4458309067c383642cddfb90599f62
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
| |
Partition names within the same case should
have the same suffix.
Change-Id: Ib4ff0fbcd823ce8fe44a80a540087c79bafb6b9a
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
|
|
|
|
|
|
|
|
| |
Make sure the return values are what is expected and that
there is no seg faulting
Change-Id: I344835bca44ba0277813ae2465b79f286fd11f37
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Multiple QJsonDbConnection instances (possibly living in different threads)
should be able to safely access same or different private partitions.
Change-Id: Idfb435784dd173ed661835f0f20986d1c50e0d7a
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
|
|
|
|
|
|
|
|
| |
Query model (and list model that uses it) was crashing, if
query was changed while the model had pending queries.
Change-Id: Ibaa5c72696d201200ba4e5c53d17594625df3b97
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the don't know the _type we cannot figure out the object table the object is
stored in, so for now lets assume it is the main object table. This will still
be broken if the assumption is wrong and the query like [?_uuid="{123}"] is
actually against a view object, but this should be fixed in one of the next
patches where we remove the concept of object tables and store all objects in
one main object table.
Change-Id: Icc259cc857b691acca3f316d7dea29244616ffe3
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was already a convenience signal that is emitted when object is found,
however when object is not found in the database, nothing but finished() was
emitted with zero results, which made the convenience api not convenient to use
:)
Change-Id: I3ea18ac37bbfd60a090b2f9f5b662df30133437e
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|
|
|
|
| |
Change-Id: I4b39adcb17376a1c1be2bf3610b9d31eb05b3d3a
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch modifies the behavior introduced by
53df42aee7db1b4f8446c63939d2cb3b7c553078 as follows:
Upon loading a partition definition that has both the
removable and default properties set to true, the daemon
now sets the default property to false instead of exiting.
If all partitions are marked as removable, the daemon creates
a new one (in CWD, assumed to be on a non-removable medium!)
to serve as the default partition.
Change-Id: Ia2911d5847040bef7a638d64e8102eba4c8c60a8
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
|
| |
if the state number is too far in the future, or the partition is not
available, or the watcher spans multiple object tables, report an error to the
caller.
Change-Id: I4b1e4fa2859b1e781f5b3d70e639c70fab1ae2db
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia5895aa11728a2c4e2f6478bc39540dfc393dff3
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: I074e4a84999ff22b547eedb19d9f6a9b28b002d8
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
| |
Change-Id: I9cd02837532e36b594a6cb01c6f620e175ce2844
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
| |
Change-Id: I0a0a4497fda098d9bbe6f97d32bcfd4f2a872137
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This previous change to this part of the code was to prevent a given
object change from being processed multiple times. However, I put the
break in the wrong level of the loop, so only the first eager view
depending on that source type would be updated, and others would just
be marked as updated without being processed.
Fixes Bug #16440.
Change-Id: I1634a249e4ec6923100950fc5f45e449588b01d2
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
No sense to maintain two implementations of the same functionality.
JsonDBListModel was also blocking the ui way too much.
Added (deprecated) methods & properties to caching list model
to support JsonDbListModel. Setters were not implemented as it
is a bad idea anyway and Partition.update should be used.
After that renamed caching list model as JsonDBListModel.
Changed also documentation accordingly.
Incompatibilities: Setters are not supported and data() is async
(=can return undefined + signal dataChanged later on when real data
is available)
Change-Id: I641d80361db728a3cdf1584e75ad18f22d9223a8
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: I25bdc36b070ea5f0e96da375bedbc1444759b994
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This changes btree to hold the advisory lock the whole time the btree file is
kept open and accessed. The current implementation does not support concurrent
access from multiple processes (or even from multiple file descriptors in the
same process) - neither for writes nor for reads. Holding the lock on the file
should ensure that if somehow multiple processes try to open the same database
file, we don't just corrupt the db file, but gracefully fail to open it.
Change-Id: Ib0c6e3aec0e087fedbfbb859758773182e74e46f
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TestQJsonDbRequest::dontAllowDefaultAndRemovablePartition() launches
a secondary test daemon that updates the global JSONDB_SOCKET
environment variable as a side effect. It therefore needs to restore
it back to the primary value after each call.
Also eliminate runtime warnings due to the path not being explicitly
set in the partition definition.
Change-Id: I2a201d4f4fff419f0f6d04582c4c4210ea0094f0
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
| |
The purpose of this autotest is to check different storage
conditions, including out of space and device errors.
Change-Id: I47bf94ea7f3f9c41bfc1f1036f6047f5e214e9d4
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change separates the cachinglistmodel logic from
the implementation of qml-specific aspects of the
jsondbcachinglistmodel.
The code is migrated into new private classes in client and
reused by the imports/jsondb models.
The new classes include functionality of the following
components previously embedded in the qml jsondb plugin:
- JsonDbCachingListModel
- modelutils
- modelcache
In the new setup, the QJsonDbQueryModel class
implements the functionality previously provided by the
src/imports/jsondb JsonDbCachingListModel and
JsonDbCachingListModelPrivate classes.
Modelutils and modelcache helpers are now also part of the
private API in client.
No functional / performance regression is observed
after running models tests and benchmarks on top of this.
The idea is to make QJsonDbQueryModel part of the public
C++ api after a few rounds of reviewes & iterations.
Change-Id: Ia6e2368a4cb7c7485087e714642e00ff686945b7
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch contains the following improvements in the code that launches the test daemon:
- Introducing a _helper function to eliminate code duplication in launchJsonDbDaemon()
and launchJsonDbDaemonDetached()
- Fixing two bugs when launching the test daemon in detached mode:
- valgrind didn't work
- a null-pointer access would have happened if the working directory was explicitly set
Change-Id: I761ecfb2833d79263bed69eea2dd537c37f51099
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: I29d8b4df901b7739ef6760755d16998377b696bd
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
| |
Change-Id: If4eae928e8a21b76de481daf3905f6de4a46456f
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Only non-removable partitions should be allowed to be used as
the default partition.
This patch enforces this policy by having the daemon exiting with
an error message once it sees that
1) at least one partition is explicitly specified as both default and removable, or
2) all partitions are specified as removable (thus making it impossible to auto-select
a valid default partition)
Change-Id: I7084c228c6eb9db7bef44cae75a4d5a7c58299e9
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: I059419b63d18ce89b865e91a2e60e90b4c806604
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add JsonDbSettings::useStrictMode() to control whether jsondb enforces
javascript strict mode.
To enable:
JSONDB_USE_STRICT_MODE=true jsondb
Fixes Bug #16114
Change-Id: I01891984d4a2d48a4aaa1b1294d8c993b7b12608
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I95d81cbf365c186325e8ac23901fb4e506ab3766
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
|
|
|
|
|
|
|
|
| |
It is much more convenient if it is safe to assume that the returned default
connection is already connected, or will be autotomatically connected.
Change-Id: I5e0d89ad34f156b5cee5ca6e0f25eb79c32a2bca
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
QJsonDbWatcher was setting its status to Inactive before the deactivation
request was processed by the server (and hence it was possible to receive
notifications and emit notificationsAvailable() signal even though the status
== Inactive). Fixed it to deactive asynchronously so that the status changes
when the server replies to deactivation request.
Change-Id: If2940e7afb9d1cb75d0579657f6f2c95e2c50099
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When the watcher is added and then removed right away, there is an internal
request in the queue that will trigger later and call a _q_onFinished slot in
the watcher, which can hit the assert and crash.
Change-Id: Ibe3cd42b3124328516bce716045597b0319d8364
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
| |
Change-Id: I7687ae1e7aa02cdc296423d8e60046d5e118cc49
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
| |
Change-Id: Ic65f10f97e8556d1d80f51f506f12ca438e186db
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This reverts commit deac81d4ef114ffc157467183d02d539618a14d1.
Breaks the connect because of overloaded error (signal and function)
Change-Id: If46e8be5f090ef97f5b832a86c0b81bcb4aa9cb7
Reviewed-by: Ian Monroe <ian.monroe@nokia.com>
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Due to changes in include files in gcc 4.7, the header unistd.h
now has to be included in some situations.
Change-Id: Ib7e56d2356c98973909494be9dc8ee414e6fbfbf
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
|
|
|
|
|
|
|
| |
And clean up one unused variable.
Change-Id: I740ec41f7931d8a01d9827855d180b44fc5bd0aa
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
| |
Change-Id: I4f224d8fd8990f91b383fc691f7e814a92eea1c2
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
|
|
|
|
| |
For that to work I've added QJsonDbStandardPaths that has convenience functions
for retrieving home directories for different users and a switch for using a
prefix instead of real users, which can be used in autotests.
Change-Id: Ibcbba2fe17498b722f5cbe33fc3a1c16f75f3283
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|
|
|
|
|
| |
Change-Id: I2ee101126b494287ae8d4a62601ed49d510cf56a
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
|