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 /tests/auto/auto.pro | |
| 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 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index df6f764e..7dfd552e 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,26 +1,26 @@ TEMPLATE = subdirs SUBDIRS += \ accessibility \ - applicationwindow \ calendar \ controls \ cursor \ - drawer \ focus \ font \ - menu \ palette \ platform \ - popup \ pressandhold \ + qquickapplicationwindow \ qquickcolor \ + qquickdrawer \ qquickiconimage \ qquickiconlabel \ qquickimaginestyle \ qquickmaterialstyle \ qquickmaterialstyleconf \ + qquickmenu \ qquickmenubar \ qquickninepatchimage \ + qquickpopup \ qquickstyle \ qquickstyleselector \ qquickuniversalstyle \ @@ -28,4 +28,3 @@ SUBDIRS += \ revisions \ sanity \ snippets - |