diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
| commit | e137877eaaa3975a6769fd2dd574bd75876fcfa5 (patch) | |
| tree | a397bdb1389ea02e6fb7b083e3e149b8a0de50cf /examples/quick/demos/stocqt/content/Button.qml | |
| parent | 6b53e7e16df0a2451d2b7948ad35485301c564b6 (diff) | |
| parent | 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
examples/quick/demos/photoviewer/i18n/qml_de.ts
examples/quick/demos/photoviewer/i18n/qml_fr.ts
examples/quick/demos/photoviewer/photoviewer.pro
examples/quick/demos/photoviewer/qml.qrc
src/qml/compiler/qv4instr_moth_p.h
tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Change-Id: Ibea76b468577c2a68bd305cee82ae6444d0f8073
Diffstat (limited to 'examples/quick/demos/stocqt/content/Button.qml')
0 files changed, 0 insertions, 0 deletions