summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-06-08 09:11:39 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-06-08 09:11:39 +0200
commit38be5b605a844693bb93d24fab8c721bec273003 (patch)
treebd8f5271078bca73acb1c33d7ee6f6f5a02b6a59 /.gitignore
parent20d141034b48ae73eee70743dc410d35491cd00f (diff)
parenta5f8ceee8547c3447675d1c4e70f5706bbd2bd99 (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--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 775a39da..400fe075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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