diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-05-17 09:53:35 +0200 |
|---|---|---|
| committer | Antti Hölttä <ahoelttae@luxoft.com> | 2018-05-17 12:47:54 +0000 |
| commit | 09392094a6c70aa0271f9645f67028bb8014b582 (patch) | |
| tree | f4a8934e5822b52ba333586869064bfaaa723bc6 | |
| parent | 61bc5e6c8c02fdd5878692cf963d505eb19e5536 (diff) | |
ivigenerator: Fix the Q_PROPERTY NOTIFY part for uppercase properties
Also added a all uppercase property to our autotest qface files
Change-Id: Ibd76d5bc8e025494aee3675ffa69c6badb4d8d5a
Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>
| -rw-r--r-- | src/tools/ivigenerator/common/qtivi_macros.j2 | 2 | ||||
| -rw-r--r-- | tests/auto/core/ivigenerator/org.example.echo.qface | 2 | ||||
| -rw-r--r-- | tests/auto/core/ivigenerator/org.example.echo.qtro.qface | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/ivigenerator/common/qtivi_macros.j2 b/src/tools/ivigenerator/common/qtivi_macros.j2 index 2d07d76..5f4be7b 100644 --- a/src/tools/ivigenerator/common/qtivi_macros.j2 +++ b/src/tools/ivigenerator/common/qtivi_macros.j2 @@ -86,7 +86,7 @@ QIviPendingReply<{{operation|return_type}}> {{scope}}{{operation}}({{join_params {% set write = ' WRITE ' + property|setter_name %} {% endif %} {% if notify %} -{% set _notify = ' NOTIFY ' + property|lowerfirst + 'Changed' %} +{% set _notify = ' NOTIFY ' + property.name + 'Changed' %} {% else %} {% set _notify = ''%} {% endif %} diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface index e1bf983..07ac74f 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.qface +++ b/tests/auto/core/ivigenerator/org.example.echo.qface @@ -33,6 +33,7 @@ interface Echo { model<Contact> contactList; Contact contact; WeekDay weekDay; + real UPPERCASEPROPERTY; string echo(string msg); string id() const; @@ -67,6 +68,7 @@ interface EchoZoned { int rangedValue; int rangedValueWithDefault; Contact contact; + real UPPERCASEPROPERTY; string echo(string msg); string id(); diff --git a/tests/auto/core/ivigenerator/org.example.echo.qtro.qface b/tests/auto/core/ivigenerator/org.example.echo.qtro.qface index d9a446a..9d4b93b 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.qtro.qface +++ b/tests/auto/core/ivigenerator/org.example.echo.qtro.qface @@ -33,6 +33,7 @@ interface Echo { list<Contact> contactList; Contact contact; WeekDay weekDay; + real UPPERCASEPROPERTY; string echo(string msg); string id() const; |