diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 20:07:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 20:46:48 +0200 |
| commit | 7e85c09d2575a21a4e4e57eb4a275918ca10f4fd (patch) | |
| tree | 4a5abe647e8f3da0bc58afc293867fc6812a2500 /.gitignore | |
| parent | 5dcd4daa0dbc9cd3618744193985f81e475d311a (diff) | |
| parent | 576a97774e04858adee9f2080e485a715e985820 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.gitignore
tests/auto/auto.pro
tests/auto/qquickmenu/tst_qquickmenu.cpp
tests/auto/qquickpopup/tst_qquickpopup.cpp
Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -27,7 +27,6 @@ /examples/quickcontrols2/wearable/wearable /tests/auto/accessibility/tst_accessibility -/tests/auto/applicationwindow/tst_applicationwindow /tests/auto/calendar/tst_calendar /tests/auto/controls/default/tst_default /tests/auto/controls/fusion/tst_fusion @@ -35,22 +34,23 @@ /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/font/tst_font -/tests/auto/menu/tst_menu /tests/auto/palette/tst_palette /tests/auto/platform/tst_platform -/tests/auto/popup/tst_popup /tests/auto/pressandhold/tst_pressandhold +/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow /tests/auto/qquickcolor/tst_qquickcolor +/tests/auto/qquickdrawer/tst_qquickdrawer /tests/auto/qquickiconimage/tst_qquickiconimage /tests/auto/qquickiconlabel/tst_qquickiconlabel /tests/auto/qquickimaginestyle/tst_qquickimaginestyle /tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle /tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf +/tests/auto/qquickmenu/tst_qquickmenu /tests/auto/qquickmenubar/tst_qquickmenubar /tests/auto/qquickninepatchimage/tst_qquickninepatchimage +/tests/auto/qquickpopup/tst_qquickpopup /tests/auto/qquickstyle/tst_qquickstyle /tests/auto/qquickstyleselector/tst_qquickstyleselector /tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle |