diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
| commit | 38be5b605a844693bb93d24fab8c721bec273003 (patch) | |
| tree | bd8f5271078bca73acb1c33d7ee6f6f5a02b6a59 /.gitignore | |
| parent | 20d141034b48ae73eee70743dc410d35491cd00f (diff) | |
| parent | a5f8ceee8547c3447675d1c4e70f5706bbd2bd99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickmenu.cpp
src/quicktemplates2/qquickmenu_p.h
src/quicktemplates2/qquickpopup.cpp
tests/auto/auto.pro
Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -36,6 +36,7 @@ /tests/auto/cursor/tst_cursor /tests/auto/drawer/tst_drawer /tests/auto/focus/tst_focus +/tests/auto/font/tst_font /tests/auto/menu/tst_menu /tests/auto/palette/tst_palette /tests/auto/platform/tst_platform |