Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral into lp:ubuntu-ui-toolkit/staging

  1. contextPropertyWindowQStringLiteral
  2. Merge into staging
Proposed by Christian Dywan on 2016-09-29
Status: Merged
Approved by: Tim Peeters on 2016-09-29
Approved revision: 2134
Merged at revision: 2134
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 12 lines (+1/-1)
1 file modified
src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/contextPropertyWindowQStringLiteral
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-09-29
Tim Peeters 2016-09-29 Pending
Review via email: mp+307154@code.launchpad.net

Commit Message

Fix warning about using implicit char* to QString conversion

Description of the Change

This fixes a missing QStringLiteral macro around the "window" context property.

ubuntutoolkitmodule.cpp: In static member function 'static void UbuntuToolkitModule::initializeContextProperties(QQmlEngine*)':
ubuntutoolkitmodule.cpp:197:52: warning: 'QString::QString(const char*)' is deprecated [-Wdeprecated-declarations]
     context->setContextProperty("window", Q_NULLPTR);
                                                    ^
In file included from /usr/include/x86_64-linux-gnu/qt5/QtCore/qobject.h:41:0,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qabstractanimation.h:37,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/QtCore:4,
                 from ../../include/UbuntuToolkit/UbuntuToolkitDepends:3:
/usr/include/x86_64-linux-gnu/qt5/QtCore/qstring.h:654:31: note: declared here
     inline QT_ASCII_CAST_WARN QString(const char *ch)

To post a comment you must log in.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2134
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/812/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1514
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1514/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1521
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1305
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1271
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/85
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6940/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6939
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6933
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6932
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6934
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6935

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/812/rebuild

review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
2--- src/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-09-24 17:42:53 +0000
3+++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-09-29 10:34:48 +0000
4@@ -194,7 +194,7 @@
5 // Make the context property 'window' available even before there is a window,
6 // so that in QML we do not have to check whether 'window' is defined, and no new
7 // context property will be added after all components are completed (bug #1621509).
8- context->setContextProperty("window", Q_NULLPTR);
9+ context->setContextProperty(QStringLiteral("window"), Q_NULLPTR);
10 }
11
12 void UbuntuToolkitModule::registerTypesToVersion(const char *uri, int major, int minor)

Subscribers

People subscribed via source and target branches