aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_NULLPTR with nullptrHEADdevKevin Funk2017-09-263-3/+3
| | | | | Change-Id: I6125e1e4f280b9f36f3146777a67a3a0443c5905 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Oswald Buddenhagen2016-07-011-1/+1
|\ | | | | | | Change-Id: I58f3843f7dffd69b3924b652b8401ce5de2021ba
| * Add Q_DECL_OVERRIDERobert Loehning2016-06-131-1/+1
| | | | | | | | | | | | | | Fixes compilation with clang 3.8 Change-Id: I965a7d69e50a8b0ea5b541b164df431a390deb51 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-233-6/+6
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie164bbaaa8c78c13d75c85d0edcc2ea4d76fe738
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-122-2/+2
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Iefc58fb8e042ef45dda8e918fce4ea45ab0fc80d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * standardize statement order in project files a bitOswald Buddenhagen2016-04-131-1/+2
| | | | | | | | | | | | Change-Id: I20422e195b91523aecb61f83fcbee4ef115bd673 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-04-131-3/+2
| | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ib9295d0bd8ce51505af6e39a381a4076c8ee2d6e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-075-5/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia24723d25cf0621078a9567ea95417d9a4048e6b
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I799040633b2d1fc15ccafb42b4eb932b55cf1a55 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Doc: Fix navigation and build versionv5.6.0Topi Reinio2015-12-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation navigation: - Default to Qt index page as the home page - Use the same landing page for all doc modules - Remove custom build version (it now follows Qt version) - Add navigation for C++ classes, QML types Change-Id: I3b00940dabb3cd518cffe2e21a87913e008a912e Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Do not export fully inlined classKai Koehne2015-12-011-1/+1
|/ | | | | | | | | | | Exporting a class deriving from QPair fails in MSVC 2015 RTM after commit 226ce6020ee4eb in qtbase. Task-number: QTBUG-49658 Change-Id: Id07e620a4a2d0f454232f349a51380170f5230ce Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Doc: Remove example highlightingv5.6.0-beta1Topi Reinio2015-11-271-3/+0
| | | | | | Change-Id: I6ea9808d068ef72993d63f2fe62bc13461d89bff Task-number: QTBUG-49458 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix debug-and-release buildFrederik Gladhorn2015-11-061-11/+2
| | | | | | | | | | | | | Enginio is part of the Qt release and there is no need to do magic hacks to install the qmldir file. This was supposed to help running examples separately, but we assume that the lib is shipped with Qt proper. The problem was that the qmldir file would be simultaneously copied into the same location twice which will fail on Windows. Change-Id: I57dc18af361f4bdfc00c8c4a12bbe1f0986eb34f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-212-2/+2
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix each install path with the repository name. Task-number: QTBUG-48736 Change-Id: I0bd2e054b8302f7c0054469e85265a4bebf24c50 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge remote-tracking branch 'origin/1.2' into 5.6Liang Qi2015-10-131-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icaade4d6cab13f7b8b7ffc3b8a759effe5aafaf9
| * 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>
* | Doc: replaced \target with \keyword at top of pageNico Vertriest2015-09-304-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | A \target whose purpose is to link to the top of a page (and not to a section within a page) works better as a \keyword, because \target generates a new html anchor which, in this case, is not tied to any title element on the page. A \keyword links to the page itself, as expected. Task-number: QTBUG-48482 Change-Id: Ia570d8cb344840f62e7d32b462346b19668861cd Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Update plugins.qmltypesKai Koehne2015-09-182-2/+282
| | | | | | | | | | | | Change-Id: I006d1d38b9a592e8eea6c4218b788fa585ef4512 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/1.2' into devLiang Qi2015-06-065-17/+60
|\| | | | | | | Change-Id: I719253298a760e88a6ebab0cbf27e35cecc418a9
| * Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.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 \qmlpropertySergio 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 05:17:28 +0000