diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
| commit | 0524ddb9489cd9816fadc330f75efc7b40994013 (patch) | |
| tree | 834607a15e646d416e2512f8f4a05ae222495de5 /tests/auto/auto.pro | |
| parent | 2568869819863de6b1f303dfe470aedf38b841c3 (diff) | |
| parent | 53c780f15c2d170514f74d949a8165033275bddd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/material/qquickmaterialstyle.cpp
src/imports/controls/universal/qquickuniversalstyle.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquicktooltip.cpp
tests/auto/auto.pro
Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8272dbe7..4dabf06f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -10,9 +10,11 @@ SUBDIRS += \ popup \ pressandhold \ qquickmaterialstyle \ + qquickmaterialstyleconf \ qquickstyle \ qquickstyleselector \ qquickuniversalstyle \ + qquickuniversalstyleconf \ revisions \ sanity \ snippets |