diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
| commit | d1f4409a2b1e0143be0d4fd734f3dd83255ea35c (patch) | |
| tree | 52daa990c1da2c2ce9656fe4065b73a848a57a5a /tests/auto/widgets/widgets.pro | |
| parent | 8e5ac243ac774209b77bec42eda2ec43f9c9b04a (diff) | |
| parent | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
Diffstat (limited to 'tests/auto/widgets/widgets.pro')
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index c65d7dd6c..6c516b38f 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -2,6 +2,7 @@ TEMPLATE = subdirs SUBDIRS += \ qwebengineaccessibility \ + qwebenginedefaultsurfaceformat \ qwebenginefaviconmanager \ qwebenginepage \ qwebenginehistory \ |