summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Update copyright headersAntti Kokko2015-02-17108-1383/+967
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I3af24310387050e692210e28566d4d4220773f06 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | enginiomodel: Fix typo in word ‘overridden’.Dmitry Shachnev2015-01-161-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic68b5229c8756089426b5e254444d1a09ded3f01 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I82f525cf2e7c612bf8adc167bdd7b3c3f78124d9
* | Allow update all item's properties in one EnginioModel::setData callJędrzej Nowacki2014-08-086-28/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new preconfigured role to EnginioModel, which can be used to update multiple properties of an item in one function call. [ChangeLog] EnginioModel is able to update multiple properties of an item in one setData function call. It can be achieved by using Enginio::JsonObjectRole. Change-Id: Ibc640d44f28d40fa349c6efdf65e3bb321a4fc79 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Automatically refresh EnginioModel if identity was changedJędrzej Nowacki2014-08-082-0/+56
| | | | | | | | | | | | | | | | | | | | | | The server automatically filter data based on ACL. It means that for example after a succesfull login, a query result may be different. [ChangeLog][Enginio] Automatically refresh EnginioModel contents when identity changes. Change-Id: Ied814d00b8cfb872fcd2ab2e6e7f51692e894890 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Allow to directly query objects through object's id.Jędrzej Nowacki2014-08-073-71/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change inserts, if given, an object id to request path. It allows to construct query objects with only type name and id. Such query is equivalent to a "view" request, that means that instead of returning a array of results it gives full object only as a result. From user perspective this change simplify certain group of queries, for example this query: QJsonObject query = {{"objectType", "objects.foo"}, {"query", {{"id", "1233"}}}}; could be changed to: QJsonObject query = {{"objectType", "objects.foo"}, {"id", "1233"}}; The change cleanups a bit path computation, by not adding an object id as a fall-back operation. Because of that hint IncludeIdPath could be replaced by RequireIdPath, which is easier to interpret. It shows that an operation has no chances to success if an id is missing. Change-Id: If2bf09da0d7c4388493476a16b138640022c8581 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Do not create custom backend for tst_filesJędrzej Nowacki2014-08-011-54/+40
| | | | | | | | | | | | | | | | It should be faster and more stable, at cost of more complex backend configuration, Change-Id: I3b2e202c9e69ac7ffec37b5626e343cfcc818024 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Remove extra semi-colons in enginioThiago Macieira2014-07-314-7/+7
| | | | | | | | | | | | | | enginioreplystate.h:62:41: error: extra ‘;’ [-Wpedantic] Change-Id: I7894ae409184cfadd26dcb37ce4215f67fcedf4f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/1.0' into devFrederik Gladhorn2014-07-2830-168/+321
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I98fec4d0cd8110549d6efc00112678e076781ed4
| * Fix QDebug includesJędrzej Nowacki2014-07-146-2/+8
| | | | | | | | | | | | | | Really we shouldn't include QDebug in a public header. Change-Id: I69d07e641123ec860ba7d6a34f736af067e6a3ab Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Fix static buildFrederik Gladhorn2014-07-021-3/+7
| | | | | | | | | | | | Task-number: QTBUG-39962 Change-Id: I58b4bb6e8a1abeceebabe559ac16a40ae29f7d15 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Merge remote-tracking branch 'origin/1.0.5' into 1.0Frederik Gladhorn2014-06-251-0/+22
| |\ | | | | | | | | | Change-Id: I370f3c3e2da42913a4f87ec2c2d9beee9b4d0678
| | * Add change log file for 1.0.5 version1.0.5Jędrzej Nowacki2014-06-221-0/+22
| | | | | | | | | | | | | | | | | | | | | Change-Id: If6f6e0e8020ec9011382d1ebb2c6c920602c79df Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Add dummy cmake test for enginio.Stephen Kelly2014-06-243-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The create_cmake.prf will check for the existence of the unit test, but the enginio files are known to be broken. Skip them as an exeption. Change-Id: I57aa7d0f61ad689a5c2d349a0bd4ad25111a9138 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | Bump versionOswald Buddenhagen2014-06-181-1/+1
| |/ | | | | | | Change-Id: I9b91e3e85a530d7eb4eb5594d24e627aee1ccb18
| * Doc: review updated Enginio documentationv1.0.5stableNico Vertriest2014-05-279-139/+159
| | | | | | | | | | | | Task-number: QTBUG-39112 Change-Id: I41fa0391d68703afffb8bd67c1d9ce9f3ba4e259 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add even more debug output to tst_files.Jędrzej Nowacki2014-05-151-6/+8
| | | | | | | | | | | | | | | | The test blocks CI sadly nobody can reproduce the failure locally. This change is extension to c416ada9bebed82c9859882da14078222354c0d4 Change-Id: I00fd29286a2ea35c4dbb2396471d471ddc94882b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-142-1/+6
| |\ | | | | | | | | | Change-Id: I9938394603201db675944a2c0f9512bbd9e06646
| | * Doc: Adding link to the "Enginio Namespace" page.v1.0.4-rc1v1.0.4Jerome Pasion2014-05-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Enginio namespace wasn't included and detected by QDoc as part of the group/module. Task-number: QTBUG-33360 Change-Id: If1f2af0ef82895f2c50f1a60fcfc3e5916c74449 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-05-133-1/+40
| |\ \ | | | | | | | | | | | | refs/staging/stable
| | * \ Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-013-1/+40
| | |\ \ | | | |/ | | | | | | | | Change-Id: Ic93dff7bb023fa16e9b54894909066c4a7281fc0
| | | * Add changelog file for 1.0.4 versionJędrzej Nowacki2014-04-301-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id770b46babf6cd5ba25d658b6f3f86736c137cde Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | | * Update plugin infoFrederik Gladhorn2014-04-251-1/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib50022469aaf9c0d03aae961738ba03f5d8f7fe8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | | * Doc: Add QML Todo example to the list of highlighted examplesTopi Reinio2014-04-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-37203 Change-Id: Id9067acb70538f85c7aae02d99df77d78643309e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | sync.profile: Point dependencies to an empty stringSergio Ahumada2014-05-131-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I254a65207d37600be0157d8f53a45d59e55533a0 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Add debug output tst_files test.Jędrzej Nowacki2014-05-051-6/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | The test seems to be flaky on CI and lately it fails quite often, sadly nobody can reproduce the failure locally. Change-Id: I8e98c2946b7fd4f9750dc80e45ff007b56fd2fdc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Add user agent to each request header.Jędrzej Nowacki2014-04-285-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | This way we can gather statistics about usage of Enginio api. Change-Id: I09dd735abe1090c31998e4f6c97aa49a26285730 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jędrzej Nowacki2014-04-241-13/+4
| |\ \ | | | | | | | | | | | | refs/staging/stable
| | * \ Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-231-13/+4
| | |\ \ | | | |/ | | | | | | | | Change-Id: I4b9ced111eae96d6064be237d80e5038888100dd
| | | * Mark EnginioClientConnection::serviceUrl as publicJędrzej Nowacki2014-04-111-13/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | The function should be public as the Enginio allows usage of different backend urls. Change-Id: I9a665de26137f4641618f40044b182a21aaf670f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Bump MODULE_VERSION to 1.0.5Sergio Ahumada2014-04-231-1/+1
| |/ | | | | | | | | Change-Id: I00eb09b39bcee55402fe50c4ded98e897f7119a0 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-073-3/+0
| | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I8a417699e2b2e7a33a3b4a3ccc6174e99955ebbe Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | fix/optimize dependencies on qt modulesTasuku Suzuki2014-07-075-8/+8
| | | | | | | | | | Change-Id: I50bb083523431f9bd8d3da24e3364bb088c8f0ef Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: I0fedbf8b8b7382e3e82402048e81a44a6e5d7a32 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fix singature of EnginioBaseModelPrivate::receivedNotification.Jędrzej Nowacki2014-05-212-2/+2
| | | | | | | | | | Change-Id: Ic7bc3a086fb2012df8de89724ff138df54b39869 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Introduce EnginioModel::reloadFrederik Gladhorn2014-04-297-10/+205
| | | | | | | | | | | | | | | | [ChangeLog][EnginioModel] Added reload() function to EnginioModel to force a refresh of all model data. Change-Id: I7b1a3fdd6e63950f5494d4bab8511feb9f80d9fb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-116-19/+33
|\ \ | |/ | | | | Change-Id: I55dd178b83ec44d76002eac40a8bbbd4d2826c79
| * Update error message and documentation of EnginioModel::setData()Jędrzej Nowacki2014-04-092-3/+3
| | | | | | | | | | Change-Id: Ib3f3f1163ef2d9c187c5334dff8c1d139915d755 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Fix documentation link to Enginio::AuthenticationStateJędrzej Nowacki2014-04-071-1/+1
| | | | | | | | | | Change-Id: I61d0c5dfdc9eb649b8be0f372dedf18220e51213 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Doc: Avoid linking to collision pagesTopi Reinio2014-04-024-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++ class and QML type references for EnginioModel use a shared doc-include file to document a number of property/method. This commit splits the model-query.qdocinc content in two, so that we can pass a correctly disambiguated link as an argument from the documentation that uses the include. This way, we avoid linking to collision pages. Also moves the 'see also' links to the actual property/method documentation, fixes the \return commands, and does some other cleanup. Change-Id: Ia6e178f0ee91625e62289134eada7fb1edc85f62 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Bump version to 1.1.0Sergio Ahumada2014-04-011-1/+1
| | | | | | | | | | Change-Id: I2a8d1815d1a62581c6901788c5e5771d58a33cbe Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-0118-117/+57
|\ \ | |/ | | | | Change-Id: Iacadbce2ac77cbd7755a1b3d6a5d33b021a4cd52
| * Doc: Adding \since commands to the C++ and QML API.Jerome Pasion2014-03-317-2/+10
| | | | | | | | | | | | | | | | -both classes and QML types should have \since. -module introduced in Qt 5.3. Change-Id: I12e0b1df4946dfdf16cd97567b5745b4b308d781 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Doc: Adding C++ classes page to list of modules.Jerome Pasion2014-03-311-0/+1
| | | | | | | | | | | | | | | | -this page will then be listed in the "All Classes by Module" page. Change-Id: I7804d9aa780d28224edfcb310a6e2d362d329faa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Doc: Fix a number of documentation issuesTopi Reinio2014-03-2613-115/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a number of documentation issues: - Rename index.html landing page (collides with Qt docs) - Fix navigation - Create Enginio QML module page to get correct documentation for import statement, fix linking for QML types - Fix subtopics for generated QCH files - Remove unused pages and files - Update documentation namespaces and URLs - Other minor fixes Change-Id: I0a87ab6d0be7df53199e54f4ecd9f84ef30d8622 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-3/+3
|\ \ | |/ | | | | Change-Id: Id851b211dfef5e45a680d9660e6f5166b3da848f
| * Bump version to 1.0.4 for the Qt 5.3.0 releasev1.0.4-beta1Frederik Gladhorn2014-03-211-1/+1
| | | | | | | | | | | | Change-Id: I5cd5d1c962ba2c9344e36a95d8a305226bc10692 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Fix autotest failureJędrzej Nowacki2014-03-211-2/+2
| | | | | | | | | | | | | | QtNetwork gives a more specific error code, then it used to. Change-Id: I2ee5527ea3e3eae6a3b8c010a4b2bbb463e8b852 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-1746-442/+484
|\ \ | |/ | | | | Change-Id: I7828df917765008fc77d3c89a041cf1fcdf90315
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jędrzej Nowacki2014-02-142-1/+5
| |\ | | | | | | | | | refs/staging/stable
View Lorry Controller Status