diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-14 01:02:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-16 09:38:30 +0200 |
| commit | 43645fd59c6bcb0a3e37eef530ef970f51ed48af (patch) | |
| tree | d377a19c36e9e853377db59b58d937db0ea67e0d /src/qml/parser/qqmljsast_p.h | |
| parent | ad0f200df54e5afcb1fdcb977794259bdb9216b5 (diff) | |
| parent | f42207cbdb0cbe5e345bfd9e000b3e77b34a503c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quick/items/qquickloader.cpp
tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Change-Id: I0cb9f637d24ccd0ecfb50c455cc210119f744b02
Diffstat (limited to 'src/qml/parser/qqmljsast_p.h')
| -rw-r--r-- | src/qml/parser/qqmljsast_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index 2cf2bcb736..07999404b4 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -870,7 +870,7 @@ public: void accept0(Visitor *visitor) override; - QString asString() const override { return QString::number(id, 'g', 16); } + QString asString() const override; // attributes double id; |