diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
| commit | bfbcec26eb6f9423ee27d75ae5abcd70cd255390 (patch) | |
| tree | 5845eda8e07adef5dbf27d56107e5330ea5d3fbf /src/declarative/qml/qdeclarative.h | |
| parent | 4b4c6a984b2bcdfcb5a77a024e48072a7aa854ec (diff) | |
| parent | 41119e843f099ce7d80f966cc754324bfe0f063f (diff) | |
| download | qtquick1-bfbcec26eb6f9423ee27d75ae5abcd70cd255390.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
Diffstat (limited to 'src/declarative/qml/qdeclarative.h')
0 files changed, 0 insertions, 0 deletions