summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/1.1' into 1.2v1.2.11.2.11.2Liang Qi2015-08-190-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4448f5660650e797027013fbd5682f4c920c88d5
| * Bump version1.1Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | Change-Id: I374710d0471fa133f5ca1cee3169cf2038e123f0
* | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Doc: Added \qtvariable to enable QDoc include QT += info.Venugopal Shivashankar2015-07-311-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-47274 Change-Id: Ie8ffad3e9e464352c02bf2026541be571b3a93dd Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: I9a4b5951e5dfa705fbcfd15c8d2a867b86ed269e
* | Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.2.01.2.0Frederik Gladhorn2015-03-3121-173/+401
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: corrected issue cloudaddressbookNico Vertriest2015-02-241-2/+2
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ia8b2cac78e4acdd106ebbb139c66c0183ded077d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Merge remote-tracking branch 'origin/1.1.1' into 1.1Frederik Gladhorn2015-02-185-8/+8
| |\ | | | | | | | | | Change-Id: I1d4f5d29e5d72df2479de2a33b2d7cb010946fea
| | * Autotest: Use resources for test filesv1.1.11.1.1Rainer Keller2015-02-055-8/+8
| | | | | | | | | | | | | | | Change-Id: I4e1aac17ea5d0c4e24e8e1cc5b6ee128e5be3184 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ | | | | | | Change-Id: I5e8c61bb57ab7de594647399701c5c09cabe1ad7
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: Ibdafbb4648e7152cecdb643f5d473cdbc30128bf
| * Update sync.profileJędrzej Nowacki2014-10-131-3/+3
| | | | | | | | | | | | | | The 1.1 version of enginio should track Qt5.4 Change-Id: Icddbb933fa4ad2f9b860ec873030162564440f05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Doc: apply title case in section1 qtenginioNico Vertriest2014-10-033-5/+5
| | | | | | | | | | | | Task-number: QTBUG-40362 Change-Id: I3e95f9cd108acd57c0594c128ab2643231babe7d Reviewed-by: Topi Reiniö <topi.reinio@digia.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-255-137/+278
| | | | | | | | | | | | | | | | | | 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>
| * Doc: fix virtual folder name in qtenginiooverview.qdocconfTopi Reinio2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | Having a virtual folder name that's different from what appears in the namespace causes linking issues in the offline docs. Change-Id: Ie9b0165fa1af4349da48aaf2ff32326c2efc8a0a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Update license headers and add new license filesAntti Kokko2014-09-1955-1673/+756
| | | | | | | | | | | | | | | | | | - 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>
| * Enable build for generic ssl configsv1.1.0Andrew Knight2014-08-291-1/+1
| | | | | | | | | | | | | | | | A new config variable, ssl, is available on platforms (such as WinRT) which support SSL sockets but do not use OpenSSL. Change-Id: If0300513a071af9e740ed6f0d0e29498962ca927 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
| * Merge "Merge remote-tracking branch 'origin/1.0' into 1.1" into refs/staging/1.1Jędrzej Nowacki2014-08-292-4/+26
| |\
| | * Merge remote-tracking branch 'origin/1.0' into 1.1Frederik Gladhorn2014-08-282-4/+26
| | |\ | | | | | | | | | | | | Change-Id: Id12ab58e87ff7f6bd34e50c3381e1477650a6fba
| | | * Add change log for Enginio 1.0.61.0.6Jędrzej Nowacki2014-08-201-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I25977953c626da6f81bb8eac575321ddaa84a3c3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | | * 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>
| * | | Add Enginio 1.1 changelogJędrzej Nowacki2014-08-291-0/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: Ice7e20e923ecc71edfd75d309321ec0b3ab001dd Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | qdoc: Correct some links in QtEnginioMartin Smith2014-08-296-19/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Change examples settings domain from com.digia to QtProject.Friedemann Kleint2015-03-302-2/+2
| | | | | | | | | | | | | | | Change-Id: Id0cf4d718d8d3cb752ed214b6ac4ccd0e2bb7d79 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Fixed enginio license headers & filesJani Heikkinen2015-03-188-714/+654
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated license from old LGLP to new LGPL21 in README.md dist/packages/com.digia.enginio/meta/installscript.qs dist/packages/com.digia.enginio/meta/package.xml dist/packages/com.digia.enginioDocumentation/meta/installscript.qs Removed unused LICENSE.GPL & LICENSE.LGPL Added missing LICENSE.LGPLv21 & LICENSE.FDL Task-number: QTBUG-45042 Change-Id: If7f092a9717a9d2ccb163def785f2cd5c25182d7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Adjust wiki links to the new redirectv1.2.0-alpha1Sergio Ahumada2015-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | | it looks nicer this way Change-Id: I3bd9965d8b9f3afd123fde63e629fa1d3e6f3857 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-2/+2
| | | | | | | | | | | | | | | Change-Id: Ibd54cdb34521a34c300e9719fc0cedba4b41ebc4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | 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
View Lorry Controller Status