summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/1.2' into dev5.51.3Liang Qi2015-06-065-17/+60
|\ | | | | | | Change-Id: I719253298a760e88a6ebab0cbf27e35cecc418a9
| * Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.2.01.2.0Frederik Gladhorn2015-03-315-17/+60
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf LICENSE.LGPLv21 LICENSE.LGPLv3 src/enginio_client/chunkdevice_p.h src/enginio_client/enginio.h src/enginio_client/enginiobackendconnection.cpp src/enginio_client/enginiobackendconnection_p.h src/enginio_client/enginiobasemodel.h src/enginio_client/enginiobasemodel_p.h src/enginio_client/enginioclient.cpp src/enginio_client/enginioclient.h src/enginio_client/enginioclient_global.h src/enginio_client/enginioclient_p.h src/enginio_client/enginioclientconnection.h src/enginio_client/enginiodummyreply.cpp src/enginio_client/enginiodummyreply_p.h src/enginio_client/enginiofakereply.cpp src/enginio_client/enginiofakereply_p.h src/enginio_client/enginioidentity.cpp src/enginio_client/enginioidentity.h src/enginio_client/enginiomodel.cpp src/enginio_client/enginiomodel.h src/enginio_client/enginiooauth2authentication.h src/enginio_client/enginioobjectadaptor_p.h src/enginio_client/enginioreply.cpp src/enginio_client/enginioreply.h src/enginio_client/enginioreply_p.h src/enginio_client/enginioreplystate.h src/enginio_client/enginiostring.cpp src/enginio_client/enginiostring_p.h src/enginio_plugin/enginioplugin.cpp src/enginio_plugin/enginioplugin_p.h src/enginio_plugin/enginioqmlclient.cpp src/enginio_plugin/enginioqmlclient_p.h src/enginio_plugin/enginioqmlclient_p_p.h src/enginio_plugin/enginioqmlmodel.cpp src/enginio_plugin/enginioqmlmodel_p.h src/enginio_plugin/enginioqmlobjectadaptor_p.h src/enginio_plugin/enginioqmlreply.cpp src/enginio_plugin/enginioqmlreply_p.h tests/auto/common/common.cpp tests/auto/common/common.h tests/auto/enginioclient/tst_enginioclient.cpp tests/auto/enginiomodel/tst_enginiomodel.cpp tests/auto/files/tst_files.cpp tests/auto/identity/common/identitycommon.h tests/auto/identity/oauth2authentication/tst_oauth2authentication.cpp tests/auto/notifications/tst_notifications.cpp tests/auto/qmltests/tst_enginioclient.qml tests/auto/qmltests/tst_enginioreply.qml tests/auto/qmltests/tst_files.qml tests/auto/qmltests/tst_identity.qml tests/auto/qmltests/tst_model.qml tests/auto/qmltests/tst_qmltest.cpp tests/auto/qmltests/tst_query.qml Change-Id: Icb6a167ba58b41e1a8e4d2c8f78213eae9472864
| | * Doc: Fix missing type in \qmlproperty1.1.2Sergio Ahumada2015-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | enginioplugin.cpp:122: warning: Missing property type for EnginioOAuth2Authentication::user enginioplugin.cpp:128: warning: Missing property type for EnginioOAuth2Authentication::password Change-Id: I493e7fb3e4adc1a8dbb39c2c5356730bd7ce3a02 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | * Add QML documentation for OAuth2 identificationJędrzej Nowacki2014-09-261-10/+43
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41493 Change-Id: Ic6b768a21e294dddda730cf34145912aabcf30db Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * qdoc: Correct some links in QtEnginioMartin Smith2014-09-251-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Several links in the Enginio docs are either broken, or they got to the wrong page. The docs also need revising. Change-Id: I90edd39a94b6922d5fe4423f684fb8004de0dee3 Task-number: QTBUG-40919 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Update license headers and add new license filesAntti Kokko2014-09-1937-703/+407
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I901de75cafad74187c43baf98033909e60b49efd Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Fix some typos in a warning messageJędrzej Nowacki2014-09-151-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41287 Change-Id: Iece8f78687b412e23418adbd37b1190b8183addb Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/1.0' into 1.1" into refs/staging/1.1Jędrzej Nowacki2014-08-291-4/+4
| | |\
| | | * Merge remote-tracking branch 'origin/1.0' into 1.1Frederik Gladhorn2014-08-281-4/+4
| | | |\ | | | | | | | | | | | | | | | Change-Id: Id12ab58e87ff7f6bd34e50c3381e1477650a6fba
| | | | * Improve login code snippetJędrzej Nowacki2014-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users get confused by an identity object being deleted before the authentication is finished, therefore the snippet should use heap allocation. Change-Id: I7fafe6073680a0c89454e7000fe959ad98bc8b0a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | | qdoc: Correct some links in QtEnginioMartin Smith2014-08-293-6/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several links in the Enginio docs are either broken, or they got to the wrong page. This update fixes several cases in the overview. Change-Id: I814b2b2c6826fb1a54ac7a8fccc509281298ef77 Task-number: QTBUG-40919 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | | QtEnginIO: Fix const correctness in old style castsThiago Macieira2015-03-101-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c959afb8823262 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Update copyright headersAntti Kokko2015-02-1741-837/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Allow update all item's properties in one EnginioModel::setData callJędrzej Nowacki2014-08-085-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | 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-072-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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-2813-20/+50
|\ \ | |/ | | | | | | | | | | 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/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 remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-012-1/+17
| |\ \ | | |/ | | | | | | Change-Id: Ic93dff7bb023fa16e9b54894909066c4a7281fc0
| | * 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>
| * | Add user agent to each request header.Jędrzej Nowacki2014-04-284-0/+8
| |/ | | | | | | | | | | | | | | 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>
| * 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>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-072-2/+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-073-6/+4
| | | | | | | | | | 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-295-10/+44
|/ | | | | | | | [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>
* Update error message and documentation of EnginioModel::setData()Jędrzej Nowacki2014-04-091-2/+2
| | | | | Change-Id: Ib3f3f1163ef2d9c187c5334dff8c1d139915d755 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Doc: Avoid linking to collision pagesTopi Reinio2014-04-022-4/+14
| | | | | | | | | | | | | | | | | 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>
* 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-267-61/+19
| | | | | | | | | | | | | | | 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>
* Show qdoc and qdocconf files in Qt CreatorFrederik Gladhorn2014-02-142-0/+6
| | | | | Change-Id: Ide710d1f2d061a032df6b997c3496112b245db2a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Internal doc fixJędrzej Nowacki2014-02-141-1/+1
| | | | | Change-Id: I4f055ed8cec400e61c72c7cc8ea54711914cf0f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Merge branch 'release' into stableFrederik Gladhorn2014-01-083-147/+79
|\ | | | | | | Change-Id: Ia6d202c1655764601831db7a4ee3880c2dcc4baf
| * Update plugins.qmltypes1.0.1Frederik Gladhorn2014-01-081-140/+68
| | | | | | | | | | Change-Id: I69ce48d46536de9bead300d2932c7068a4b3f271 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Do not define debug operator<< in headerFrederik Gladhorn2014-01-022-7/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-35534 [ChangeLog][Enginio] Fixed static linking Change-Id: I0024b9d6ca816c59885d048af5d5525149de75ed Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Improve and share client docsFrederik Gladhorn2014-01-072-93/+27
| | | | | | | | | | Change-Id: Ib089f9418395c44ab937f65afe710b7fd5809689 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Improve and share model documentationFrederik Gladhorn2014-01-074-27/+16
| | | | | | | | | | | | | | Expand the docs and make them shared. Change-Id: I00a629ea00006a9f3652d3d54f51f4811d15a6cc Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fix versioning in qdocconf filesFrederik Gladhorn2014-01-062-8/+10
| | | | | | | | | | Change-Id: I162ea62fe63cb44c7476727a4952ce95a1f543ab Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Fix qml examples listing in docsFrederik Gladhorn2014-01-061-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-35475 Change-Id: If04caba3daf07f02a77e6a1b199d721fe421babe Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Make qml create and query documentation visible againFrederik Gladhorn2014-01-031-2/+2
| | | | | | | | | | | | | | | | | | qdoc doesn't manage to link to Enginio::Operation from within the Enginio qml module. Rather than not having the docs for these functions at all have broken links to Operation. Change-Id: I7e1062eea567b01cd3a3c9c358a615cf770b28d3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fix doc versioning in headersFrederik Gladhorn2014-01-032-0/+4
|/ | | | | | | Instead of showing "Qt 1.0" in the header use "Enginio 1.0" Change-Id: I79bdab5a1753e99dfe5645c50823b82be83600be Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add picture to Social Todo exampleJędrzej Nowacki2013-12-171-0/+0
| | | | | | Change-Id: Icefb3bffa0952344c2a6968ca1b6236544269b92 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
View Lorry Controller Status