diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
| commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
| tree | a390a1b5909c0396271be5f29b818ba114328e70 /tests/tests.pro | |
| parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
| parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'tests/tests.pro')
0 files changed, 0 insertions, 0 deletions