summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-12-15 11:44:26 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-12-15 11:44:26 +0100
commit1fcec5bf1e208a4f32ef4f3afa54684358a11a1d (patch)
treefebc62851b20cfc485f875e3a6303ac2791b1119 /.gitignore
parent6767d789b3544c6ff7717250e1c0dee02ad91fd4 (diff)
parent6b89293b99e763589181fd1f75470712f52cee3c (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro src/imports/controls/ComboBox.qml src/quicktemplates2/qquickabstractbutton.cpp src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickapplicationwindow_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p.h src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquicklabel_p.h src/quicktemplates2/qquicklabel_p_p.h src/quicktemplates2/qquickslider_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p.h src/quicktemplates2/qquicktextfield_p_p.h tests/auto/auto.pro tests/auto/controls/data/tst_combobox.qml Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c39bf6d2..7cd0eafe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
/tests/auto/controls/material/tst_material
/tests/auto/controls/universal/tst_universal
/tests/auto/cursor/tst_cursor
+/tests/auto/customization/tst_customization
/tests/auto/focus/tst_focus
/tests/auto/font/tst_font
/tests/auto/palette/tst_palette