qt:qtenginio.git
2 years agoAdjust wiki links to the new redirect v1.2.0-alpha1
Sergio Ahumada [Tue, 3 Mar 2015 10:16:34 +0000 (11:16 +0100)]
Adjust wiki links to the new redirect

it looks nicer this way

Change-Id: I3bd9965d8b9f3afd123fde63e629fa1d3e6f3857
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2 years agoReplace old qt-project.org wiki with wiki.qt.io
Sergio Ahumada [Mon, 2 Mar 2015 10:28:26 +0000 (11:28 +0100)]
Replace old qt-project.org wiki with wiki.qt.io

Change-Id: Ibd54cdb34521a34c300e9719fc0cedba4b41ebc4
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2 years agoUpdate copyright headers
Antti Kokko [Tue, 17 Feb 2015 10:20:48 +0000 (12:20 +0200)]
Update copyright headers

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>
2 years agoenginiomodel: Fix typo in word ‘overridden’.
Dmitry Shachnev [Fri, 26 Dec 2014 09:24:38 +0000 (12:24 +0300)]
enginiomodel: Fix typo in word ‘overridden’.

Change-Id: Ic68b5229c8756089426b5e254444d1a09ded3f01
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
3 years agoBump version
Oswald Buddenhagen [Sat, 9 Aug 2014 19:30:21 +0000 (21:30 +0200)]
Bump version

Change-Id: I82f525cf2e7c612bf8adc167bdd7b3c3f78124d9

3 years agoAllow update all item's properties in one EnginioModel::setData call
Jędrzej Nowacki [Fri, 4 Apr 2014 13:19:47 +0000 (15:19 +0200)]
Allow update all item's properties in one EnginioModel::setData call

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>
3 years agoAutomatically refresh EnginioModel if identity was changed
Jędrzej Nowacki [Tue, 29 Apr 2014 19:05:19 +0000 (19:05 +0000)]
Automatically refresh EnginioModel if identity was changed

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>
3 years agoAllow to directly query objects through object's id.
Jędrzej Nowacki [Fri, 1 Aug 2014 12:42:53 +0000 (12:42 +0000)]
Allow to directly query objects through object's id.

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>
3 years agoDo not create custom backend for tst_files
Jędrzej Nowacki [Thu, 31 Jul 2014 09:49:33 +0000 (11:49 +0200)]
Do not create custom backend for tst_files

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>
3 years agoRemove extra semi-colons in enginio
Thiago Macieira [Wed, 30 Jul 2014 06:13:18 +0000 (23:13 -0700)]
Remove extra semi-colons in enginio

enginioreplystate.h:62:41: error: extra ‘;’ [-Wpedantic]

Change-Id: I7894ae409184cfadd26dcb37ce4215f67fcedf4f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge remote-tracking branch 'origin/1.0' into dev
Frederik Gladhorn [Mon, 28 Jul 2014 13:47:11 +0000 (15:47 +0200)]
Merge remote-tracking branch 'origin/1.0' into dev

Conflicts:
.qmake.conf

Change-Id: I98fec4d0cd8110549d6efc00112678e076781ed4

3 years agoFix QDebug includes
Jędrzej Nowacki [Thu, 10 Jul 2014 12:44:04 +0000 (14:44 +0200)]
Fix QDebug includes

Really we shouldn't include QDebug in a public header.

Change-Id: I69d07e641123ec860ba7d6a34f736af067e6a3ab
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoDoc: Removing url variable from qdocconf file.
Jerome Pasion [Fri, 4 Jul 2014 12:44:08 +0000 (14:44 +0200)]
Doc: Removing url variable from qdocconf file.

-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>
3 years agofix/optimize dependencies on qt modules
Tasuku Suzuki [Sat, 28 Jun 2014 08:25:42 +0000 (17:25 +0900)]
fix/optimize dependencies on qt modules

Change-Id: I50bb083523431f9bd8d3da24e3364bb088c8f0ef
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoFix static build
Frederik Gladhorn [Mon, 30 Jun 2014 13:34:00 +0000 (15:34 +0200)]
Fix static build

Task-number: QTBUG-39962
Change-Id: I58b4bb6e8a1abeceebabe559ac16a40ae29f7d15
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge remote-tracking branch 'origin/1.0.5' into 1.0
Frederik Gladhorn [Wed, 25 Jun 2014 08:39:14 +0000 (10:39 +0200)]
Merge remote-tracking branch 'origin/1.0.5' into 1.0

Change-Id: I370f3c3e2da42913a4f87ec2c2d9beee9b4d0678

3 years agoAdd dummy cmake test for enginio.
Stephen Kelly [Sun, 22 Jun 2014 10:48:17 +0000 (12:48 +0200)]
Add dummy cmake test for enginio.

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>
3 years agoAdd change log file for 1.0.5 version
Jędrzej Nowacki [Wed, 18 Jun 2014 13:13:06 +0000 (15:13 +0200)]
Add change log file for 1.0.5 version

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>
3 years agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:29:11 +0000 (00:29 +0200)]
Bump version

Change-Id: I9b91e3e85a530d7eb4eb5594d24e627aee1ccb18

3 years agoDoc: Fix qmlclass selector used in documentation config
Topi Reinio [Wed, 11 Jun 2014 15:12:33 +0000 (17:12 +0200)]
Doc: Fix qmlclass selector used in documentation config

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>
3 years agoDoc: review updated Enginio documentation v1.0.5
Nico Vertriest [Tue, 20 May 2014 12:22:03 +0000 (14:22 +0200)]
Doc: review updated Enginio documentation

Task-number: QTBUG-39112
Change-Id: I41fa0391d68703afffb8bd67c1d9ce9f3ba4e259
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
3 years agoFix singature of EnginioBaseModelPrivate::receivedNotification.
Jędrzej Nowacki [Fri, 16 May 2014 09:18:44 +0000 (11:18 +0200)]
Fix singature of EnginioBaseModelPrivate::receivedNotification.

Change-Id: Ic7bc3a086fb2012df8de89724ff138df54b39869
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoAdd even more debug output to tst_files.
Jędrzej Nowacki [Wed, 7 May 2014 11:09:23 +0000 (13:09 +0200)]
Add even more debug output to tst_files.

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>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 14 May 2014 10:39:46 +0000 (12:39 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9938394603201db675944a2c0f9512bbd9e06646

3 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Tue, 13 May 2014 20:27:41 +0000 (22:27 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 years agosync.profile: Point dependencies to an empty string
Sergio Ahumada [Thu, 8 May 2014 10:49:26 +0000 (12:49 +0200)]
sync.profile: Point dependencies to an empty string

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>
3 years agoAdd debug output tst_files test.
Jędrzej Nowacki [Mon, 5 May 2014 10:52:39 +0000 (12:52 +0200)]
Add debug output tst_files test.

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>
3 years agoDoc: Adding link to the "Enginio Namespace" page. v1.0.4 v1.0.4-rc1
Jerome Pasion [Tue, 15 Apr 2014 10:30:39 +0000 (12:30 +0200)]
Doc: Adding link to the "Enginio Namespace" page.

-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>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Thu, 1 May 2014 10:46:11 +0000 (12:46 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic93dff7bb023fa16e9b54894909066c4a7281fc0

3 years agoAdd changelog file for 1.0.4 version
Jędrzej Nowacki [Fri, 25 Apr 2014 09:03:10 +0000 (11:03 +0200)]
Add changelog file for 1.0.4 version

Change-Id: Id770b46babf6cd5ba25d658b6f3f86736c137cde
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoIntroduce EnginioModel::reload
Frederik Gladhorn [Mon, 30 Dec 2013 11:42:47 +0000 (12:42 +0100)]
Introduce EnginioModel::reload

[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>
3 years agoAdd user agent to each request header.
Jędrzej Nowacki [Fri, 25 Apr 2014 12:35:58 +0000 (14:35 +0200)]
Add user agent to each request header.

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>
3 years agoUpdate plugin info
Frederik Gladhorn [Fri, 25 Apr 2014 12:29:13 +0000 (14:29 +0200)]
Update plugin info

Change-Id: Ib50022469aaf9c0d03aae961738ba03f5d8f7fe8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoDoc: Add QML Todo example to the list of highlighted examples
Topi Reinio [Tue, 22 Apr 2014 12:33:18 +0000 (14:33 +0200)]
Doc: Add QML Todo example to the list of highlighted examples

Task-number: QTBUG-37203
Change-Id: Id9067acb70538f85c7aae02d99df77d78643309e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Jędrzej Nowacki [Wed, 23 Apr 2014 12:28:11 +0000 (14:28 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 years agoBump MODULE_VERSION to 1.0.5
Sergio Ahumada [Thu, 17 Apr 2014 15:37:54 +0000 (17:37 +0200)]
Bump MODULE_VERSION to 1.0.5

Change-Id: I00eb09b39bcee55402fe50c4ded98e897f7119a0
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Jani Heikkinen [Wed, 23 Apr 2014 09:45:00 +0000 (12:45 +0300)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4b9ced111eae96d6064be237d80e5038888100dd

3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 11 Apr 2014 12:14:33 +0000 (14:14 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I55dd178b83ec44d76002eac40a8bbbd4d2826c79

3 years agoMark EnginioClientConnection::serviceUrl as public
Jędrzej Nowacki [Fri, 11 Apr 2014 11:52:23 +0000 (13:52 +0200)]
Mark EnginioClientConnection::serviceUrl as public

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>
3 years agoUpdate error message and documentation of EnginioModel::setData()
Jędrzej Nowacki [Fri, 4 Apr 2014 09:11:50 +0000 (11:11 +0200)]
Update error message and documentation of EnginioModel::setData()

Change-Id: Ib3f3f1163ef2d9c187c5334dff8c1d139915d755
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoFix documentation link to Enginio::AuthenticationState
Jędrzej Nowacki [Fri, 4 Apr 2014 09:14:28 +0000 (11:14 +0200)]
Fix documentation link to Enginio::AuthenticationState

Change-Id: I61d0c5dfdc9eb649b8be0f372dedf18220e51213
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoDoc: Avoid linking to collision pages
Topi Reinio [Wed, 2 Apr 2014 10:40:16 +0000 (12:40 +0200)]
Doc: Avoid linking to collision pages

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>
3 years agoBump version to 1.1.0
Sergio Ahumada [Tue, 1 Apr 2014 09:58:11 +0000 (11:58 +0200)]
Bump version to 1.1.0

Change-Id: I2a8d1815d1a62581c6901788c5e5771d58a33cbe
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Iikka Eklund [Tue, 1 Apr 2014 08:46:26 +0000 (11:46 +0300)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iacadbce2ac77cbd7755a1b3d6a5d33b021a4cd52

3 years agoDoc: Adding \since commands to the C++ and QML API.
Jerome Pasion [Mon, 31 Mar 2014 11:02:37 +0000 (13:02 +0200)]
Doc: Adding \since commands to the C++ and QML API.

-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>
3 years agoDoc: Adding C++ classes page to list of modules.
Jerome Pasion [Fri, 28 Mar 2014 15:26:56 +0000 (16:26 +0100)]
Doc: Adding C++ classes page to list of modules.

-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>
3 years agoDoc: Fix a number of documentation issues
Topi Reinio [Tue, 25 Mar 2014 12:44:14 +0000 (13:44 +0100)]
Doc: Fix a number of documentation issues

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>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Mar 2014 15:06:27 +0000 (16:06 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id851b211dfef5e45a680d9660e6f5166b3da848f

3 years agoBump version to 1.0.4 for the Qt 5.3.0 release v1.0.4-beta1
Frederik Gladhorn [Fri, 21 Mar 2014 08:57:41 +0000 (09:57 +0100)]
Bump version to 1.0.4 for the Qt 5.3.0 release

Change-Id: I5cd5d1c962ba2c9344e36a95d8a305226bc10692
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
3 years agoFix autotest failure
Jędrzej Nowacki [Fri, 21 Mar 2014 10:34:35 +0000 (11:34 +0100)]
Fix autotest failure

QtNetwork gives a more specific error code, then it used to.

Change-Id: I2ee5527ea3e3eae6a3b8c010a4b2bbb463e8b852
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 17 Feb 2014 10:22:35 +0000 (11:22 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7828df917765008fc77d3c89a041cf1fcdf90315

3 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Jędrzej Nowacki [Fri, 14 Feb 2014 11:54:45 +0000 (12:54 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 years agoShow qdoc and qdocconf files in Qt Creator
Frederik Gladhorn [Tue, 21 Jan 2014 12:29:26 +0000 (13:29 +0100)]
Show qdoc and qdocconf files in Qt Creator

Change-Id: Ide710d1f2d061a032df6b997c3496112b245db2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoInternal doc fix
Jędrzej Nowacki [Fri, 24 Jan 2014 10:01:31 +0000 (11:01 +0100)]
Internal doc fix

Change-Id: I4f055ed8cec400e61c72c7cc8ea54711914cf0f0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoUpdate information about test environment variables
Jędrzej Nowacki [Fri, 24 Jan 2014 13:27:19 +0000 (14:27 +0100)]
Update information about test environment variables

Change-Id: Ie5d390a5e2298c3eb000475e91f0a4e3423e3905
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoFix a typo in the address book example
Jędrzej Nowacki [Fri, 7 Feb 2014 11:24:45 +0000 (12:24 +0100)]
Fix a typo in the address book example

Change-Id: Ic922da1e61101d37f2c359dd58d906b0bdcd30d9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoStabilize tst_EnginioClient::fullTextSearch
Jędrzej Nowacki [Tue, 11 Feb 2014 12:24:48 +0000 (13:24 +0100)]
Stabilize tst_EnginioClient::fullTextSearch

Change-Id: Iecafc69a45b28cae3bbb5299b8b789be65fd6cbf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 11 Feb 2014 08:17:36 +0000 (09:17 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iad507212f897e2700077cfc1f4692e4f0da817f5

3 years agoCreate changelog file for 1.0.2 release
Jędrzej Nowacki [Tue, 21 Jan 2014 12:46:32 +0000 (13:46 +0100)]
Create changelog file for 1.0.2 release

Change-Id: I056d1d14398e6feb99da2de7fb145ed5afb26bd6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoBump version to 1.0.2
Frederik Gladhorn [Tue, 21 Jan 2014 12:19:22 +0000 (13:19 +0100)]
Bump version to 1.0.2

Change-Id: I44225838d44cc08317d2dba182bd6618d0d08061
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into release
Frederik Gladhorn [Tue, 21 Jan 2014 12:21:53 +0000 (13:21 +0100)]
Merge remote-tracking branch 'origin/stable' into release

Change-Id: I4127820ff319208899d0a2f4e80404365c6946b3

3 years agoEnable installation of example sources in production builds
Frederik Gladhorn [Mon, 6 Jan 2014 15:36:24 +0000 (16:36 +0100)]
Enable installation of example sources in production builds

Change-Id: Ib33b6edf3a8bfb2d063815c802a8f193b26f39cc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMerge branch 'release' into stable
Frederik Gladhorn [Wed, 8 Jan 2014 12:43:35 +0000 (13:43 +0100)]
Merge branch 'release' into stable

Change-Id: Ia6d202c1655764601831db7a4ee3880c2dcc4baf

3 years agoUpdate plugins.qmltypes 1.0.1
Frederik Gladhorn [Wed, 8 Jan 2014 09:35:56 +0000 (10:35 +0100)]
Update plugins.qmltypes

Change-Id: I69ce48d46536de9bead300d2932c7068a4b3f271
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoAdd missing change log file for 1.0.1 Enginio version
Jędrzej Nowacki [Wed, 8 Jan 2014 08:34:00 +0000 (09:34 +0100)]
Add missing change log file for 1.0.1 Enginio version

Change-Id: I602010a0ae7e92883a4ac90f145b113a48331897
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
3 years agoImprove and share client docs
Frederik Gladhorn [Mon, 30 Dec 2013 13:24:00 +0000 (14:24 +0100)]
Improve and share client docs

Change-Id: Ib089f9418395c44ab937f65afe710b7fd5809689
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoImprove and share model documentation
Frederik Gladhorn [Mon, 30 Dec 2013 12:37:59 +0000 (13:37 +0100)]
Improve and share model documentation

Expand the docs and make them shared.

Change-Id: I00a629ea00006a9f3652d3d54f51f4811d15a6cc
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoEnable -Werror for qtenginio
Frederik Gladhorn [Mon, 6 Jan 2014 15:35:31 +0000 (16:35 +0100)]
Enable -Werror for qtenginio

Change-Id: I4dcbb971975df81f14209c48a6c58ca38505ebda
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoUpdate install instructions
Frederik Gladhorn [Fri, 27 Dec 2013 10:18:37 +0000 (11:18 +0100)]
Update install instructions

Task-number: QTBUG-35119

Change-Id: If51629d60694ced7d192a77da72c4cf572094137
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoFix versioning in qdocconf files
Frederik Gladhorn [Tue, 17 Dec 2013 14:29:26 +0000 (15:29 +0100)]
Fix versioning in qdocconf files

Change-Id: I162ea62fe63cb44c7476727a4952ce95a1f543ab
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoFix text for backend helper
Frederik Gladhorn [Fri, 27 Dec 2013 13:07:20 +0000 (14:07 +0100)]
Fix text for backend helper

Change-Id: Id77d32ce062c1bb9b006c368c81959ce88d26624
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoShorten placeholder text
Frederik Gladhorn [Fri, 27 Dec 2013 12:28:06 +0000 (13:28 +0100)]
Shorten placeholder text

Change-Id: I4acda01f183434b6769625ab891db173dd3392ef
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMake qml example dashboard link clickable
Frederik Gladhorn [Fri, 27 Dec 2013 12:27:41 +0000 (13:27 +0100)]
Make qml example dashboard link clickable

Change-Id: Icc7d3cdaeb174ec80880bb0bab301b5683340584
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoFix qml examples listing in docs
Frederik Gladhorn [Fri, 27 Dec 2013 10:58:44 +0000 (11:58 +0100)]
Fix qml examples listing in docs

Task-number: QTBUG-35475

Change-Id: If04caba3daf07f02a77e6a1b199d721fe421babe
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoFix row removal after sorting in addressbook example
Frederik Gladhorn [Fri, 27 Dec 2013 10:00:07 +0000 (11:00 +0100)]
Fix row removal after sorting in addressbook example

Task-number: QTBUG-35712

Change-Id: Iaae9c9cc184860c67a66040378a35c2a585004a7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
3 years agoMake qml create and query documentation visible again
Frederik Gladhorn [Mon, 30 Dec 2013 12:24:15 +0000 (13:24 +0100)]
Make qml create and query documentation visible again

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>
3 years agoFix doc versioning in headers
Frederik Gladhorn [Mon, 30 Dec 2013 12:00:46 +0000 (13:00 +0100)]
Fix doc versioning in headers

Instead of showing "Qt 1.0" in the header use "Enginio 1.0"

Change-Id: I79bdab5a1753e99dfe5645c50823b82be83600be
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoDo not define debug operator<< in header
Frederik Gladhorn [Thu, 2 Jan 2014 15:09:20 +0000 (16:09 +0100)]
Do not define debug operator<< in header

Task-number: QTBUG-35534
[ChangeLog][Enginio] Fixed static linking

Change-Id: I0024b9d6ca816c59885d048af5d5525149de75ed
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Fri, 27 Dec 2013 09:33:16 +0000 (10:33 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9c92930ac7c26868700cba03d8f809ab4e428a42

3 years agoAdd picture to Social Todo example
Jędrzej Nowacki [Tue, 17 Dec 2013 11:15:07 +0000 (12:15 +0100)]
Add picture to Social Todo example

Change-Id: Icefb3bffa0952344c2a6968ca1b6236544269b92
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoBump Enginio client library version to 1.0.1
Jędrzej Nowacki [Tue, 17 Dec 2013 08:59:27 +0000 (09:59 +0100)]
Bump Enginio client library version to 1.0.1

Change-Id: I5bcbc0bad5aed43143c023b2e02dec9245d849ba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoFixed SocialTodos example sending unnecessary requests to network
Harri Eronen [Tue, 10 Dec 2013 12:15:20 +0000 (14:15 +0200)]
Fixed SocialTodos example sending unnecessary requests to network

Now OAuth2 request and TodoLists refresh query are reset with null
values instead of obsolete data.Thus those places wont send anynore
unnecessary requests to server.

Change-Id: I4eb52638549ea1e41dda79d6497080a7add16f7b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoFixes to sharing functionaity in SocialTodos example
Harri Eronen [Tue, 10 Dec 2013 11:54:42 +0000 (13:54 +0200)]
Fixes to sharing functionaity in SocialTodos example

Changes:

TodoList sharing is changed to use only "admin" rights -> Users can
sharethe list further

TodoList sharing supports now both grant & withdraw operations -> list
can be shared and un-shared to/from user

TodoList sharing indicates the current user in UI and prevents grant
changes for it -> App usage a bit more pleasant for random testers

Change-Id: I1605a866728bd768544dc3d44744386e8b4a9fa2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoFixed "allUsers" user add logic for SocialTodos example
Harri Eronen [Tue, 10 Dec 2013 10:43:25 +0000 (12:43 +0200)]
Fixed  "allUsers" user add logic for SocialTodos example

Now user is tried to add to "allUsers" group always after login -> App
is more robust against different error scenarios, like incomplete
backend configurations

Change-Id: Id7edd4db9ee95f451c351a2a0da561c6444bf419
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoAdd key navigation to SocialTodos login view
Harri Eronen [Tue, 10 Dec 2013 08:51:17 +0000 (10:51 +0200)]
Add key navigation to SocialTodos login view

Change-Id: Ic2e65cbb8287d6293b2729ac16e5c6cb50cd5485
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoRemove old buildsystem hacks
Frederik Gladhorn [Wed, 11 Dec 2013 18:45:27 +0000 (19:45 +0100)]
Remove old buildsystem hacks

I am not sure what the logic is, but qml_plugin.prf
adds _declarative to the library name unless we declare
the no_cxx_module. Copied from controls.

By doing that and loading the qml_plugin late we get the right
TARGET name and we get it modified the way the platform specifies.
This should fix iOS overriding the armv7 build with the lib for
the simulator which should have a different postfix (which
we cut off with our own magic).

Change-Id: I4b0bb39c2c068b78a9aeee0f0f2994941307d84b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
4 years agoFix paths in example-manifest.xml
Jędrzej Nowacki [Tue, 10 Dec 2013 15:48:44 +0000 (15:48 +0000)]
Fix paths in example-manifest.xml

The file had wrong imageUrl paths and QtCreator was
refusing to load it.

Change-Id: I07aa3af389512f59604ffc460eec4a6b55987576
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoFixed SocialTodos doc and code inconsistencies
Harri Eronen [Sun, 8 Dec 2013 17:42:28 +0000 (19:42 +0200)]
Fixed SocialTodos doc and code inconsistencies

Following changes to SocialTodos docs and code:
- Removed obsolete data validator segments from docs to make instructions simpler.
- Updated backend config instructions to match server behavior.
- Changed the code to use "allUsers" usergroup as docs were already having.

Change-Id: I82ed7fa1bbdbdb8eb8cb7c2bf3ca80670f47bf33
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoChange doc build on windows 1.0.0
Frederik Gladhorn [Mon, 9 Dec 2013 16:04:14 +0000 (17:04 +0100)]
Change doc build on windows

Do not load qt_docs.prf in the qt module.
Rename qtenginiocpp to qtenginio because the module forces that on us.
Instead of qtenginio for the overview docs we now have qtenginiooverview.
None of this is user visible, so it will be fine.

Change-Id: I77bdcb7f4784323e52b79cbe543e16ad4593e533
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoSave backend id in settings earlier
Jędrzej Nowacki [Mon, 9 Dec 2013 09:48:09 +0000 (09:48 +0000)]
Save backend id in settings earlier

Many apps, especially mobiles, are not closed but killed. In such case
BackendHelperContext dtor was not called and backend id was not saved.

Change-Id: If9e30faf9cc521ad74001d9fdf5e659f7605e7ed
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
4 years agoFix qdoc issues
Frederik Gladhorn [Fri, 6 Dec 2013 18:40:31 +0000 (19:40 +0100)]
Fix qdoc issues

Change-Id: I2f44c4ae7ba5f3d55df9eff36a1645908f29fe37
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoSplit Documentation
Frederik Gladhorn [Fri, 6 Dec 2013 17:37:55 +0000 (18:37 +0100)]
Split Documentation

This is a major cleanup. Instead of having broken links between C++ and
QML we now have 3 projects so that name-clashes do not occur any more.
It has the downside that Enginio shows up as three projects in Assistant
now, but at least all the docs are there and links work.

Change-Id: I30a79b9dc586117e19489c6ff5962fc1ef87f89f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoRemove Enginio1 namespacing attempts
Frederik Gladhorn [Fri, 6 Dec 2013 14:21:54 +0000 (15:21 +0100)]
Remove Enginio1 namespacing attempts

Change-Id: I2ff014aa8c06f669e68ef25b2c71781825166aa1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoDoc fixes
Frederik Gladhorn [Fri, 6 Dec 2013 14:17:54 +0000 (15:17 +0100)]
Doc fixes

Change-Id: I57856a9240edcd5de437633bba66b1de475e7b36
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoSplit documentation into C++ and QML
Frederik Gladhorn [Fri, 6 Dec 2013 14:06:03 +0000 (15:06 +0100)]
Split documentation into C++ and QML

Change-Id: I8737e6cbfd2fccf78d77de52353e98478fd5eecc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoMove examples into enginio directory
Frederik Gladhorn [Fri, 6 Dec 2013 13:20:59 +0000 (14:20 +0100)]
Move examples into enginio directory

Change-Id: Ifd57d60f449c4654133a1f68c74f1f01b91fa2f0
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoImprove EnginioClient::sessionAuthenticated docs
Jędrzej Nowacki [Wed, 4 Dec 2013 12:34:08 +0000 (12:34 +0000)]
Improve EnginioClient::sessionAuthenticated docs

Change-Id: I50e4e659e10d7d2dfced46e6508bbdf5e7f96a3e
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoFix QML examples on android
Jędrzej Nowacki [Thu, 5 Dec 2013 13:58:08 +0000 (13:58 +0000)]
Fix QML examples on android

Current android support does not allow to use QtWidgets and QtQuick in
one process, therefore our backend helper had to be rewritten in QML.

Change-Id: I62a1e49be3f92b1aab748221edf434862eec4e09
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoUpdate changelog
Jędrzej Nowacki [Thu, 5 Dec 2013 14:44:08 +0000 (14:44 +0000)]
Update changelog

Change-Id: Idfd9db257ab8962c44d3adaa5394c9739b73be58
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoFix and imporove EnginioReply documentation
Jędrzej Nowacki [Wed, 4 Dec 2013 13:55:40 +0000 (13:55 +0000)]
Fix and imporove EnginioReply documentation

Change-Id: I1a111b17b41d5605d2642d022c4d1af9674ba406
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>