diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:20:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-28 17:22:53 +0100 |
| commit | 8318deb165047d592523ec0b2fd10510d4953b37 (patch) | |
| tree | e80c082fbe6918e489f61d4f06deb29bbc12fa32 /.gitignore | |
| parent | 85dc3eb5d0e19d024083a9776d1ac8cf31d708ca (diff) | |
| parent | 135b5cdecaeaecb1f3afe01103eac5970399efa7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
src/templates/qquickapplicationwindow_p.h
src/templates/qquickcombobox.cpp
src/templates/qquickcombobox_p.h
src/templates/qquickpopup.cpp
Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -14,6 +14,7 @@ /tests/auto/controls/tst_controls /tests/auto/material/tst_material /tests/auto/menu/tst_menu +/tests/auto/popup/tst_popup /tests/auto/pressandhold/tst_pressandhold /tests/auto/sanity/tst_sanity /tests/auto/snippets/tst_snippets |