diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
| commit | 5112821a37ab749f758e354e84703df2d09d5471 (patch) | |
| tree | 8f19ba6e7661109675b5e1e9b0ddae94b4c96d4f /src/quick/util/qquickutilmodule.cpp | |
| parent | 5d2ea1d5e9d6e29a16d0e9333cfc2dc8e7c5b677 (diff) | |
| parent | a3f686cf7cc14ff481b972b1170a7ff76d0e0fd0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/quick/items/qquickitemsmodule.cpp
tools/qml/main.cpp
Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
Diffstat (limited to 'src/quick/util/qquickutilmodule.cpp')
0 files changed, 0 insertions, 0 deletions