diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-15 10:09:54 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-15 10:44:33 +0100 |
commit | 7f325896634a3b99e778d90e5fe738a47f855526 (patch) | |
tree | 8d68eec97ab0f8e00859ef16061c67f36d5925a1 /tools/tools.pro | |
parent | 8469f0501d9c581a6b2fd2e380187a00b47c6f8d (diff) | |
parent | 8675bb6b5a4721aa4d94dcb3cb98dbed061c164f (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qqmltypecompiler_p.h
src/qml/qml/qqmltypeloader.cpp
src/qml/qml/qqmltypeloader_p.h
Change-Id: I4894555ab7a0879b56bbda7a46d16d1c40c19e7c
Diffstat (limited to 'tools/tools.pro')
0 files changed, 0 insertions, 0 deletions