diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
| commit | 2784902b9b42de127c0903c3d6b076297cf47a07 (patch) | |
| tree | 3b95b5cdf61c951f7d54fccf47b14a0ccbce7e6c /.gitignore | |
| parent | 0a96b436d9845899888f7c7d153f0d9909ce4c06 (diff) | |
| parent | f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -32,6 +32,7 @@ /tests/auto/controls/default/tst_default /tests/auto/controls/material/tst_material /tests/auto/controls/universal/tst_universal +/tests/auto/cursor/tst_cursor /tests/auto/drawer/tst_drawer /tests/auto/focus/tst_focus /tests/auto/menu/tst_menu |