diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /tests/auto/auto.pro | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index a9904ed3..7c6f7a16 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -6,6 +6,7 @@ SUBDIRS += \ controls \ cursor \ drawer \ + focus \ menu \ platform \ popup \ @@ -22,7 +23,3 @@ SUBDIRS += \ revisions \ sanity \ snippets - -# QTBUG-50295 -!linux: SUBDIRS += \ - focus |