diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-29 14:09:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-02 12:00:57 +0200 |
| commit | 1a49f193afe1ba54339182a49d891917159f6719 (patch) | |
| tree | 986cf277193c625c2f61015c7f29c6b403a5eb02 /tests/auto/quick/quick.pro | |
| parent | 47d6b5ce11d1014548ba69df5d7b698381a8343e (diff) | |
| parent | fa138d4a76e9e820f01a75771c30dbced8c4e6f3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/resources/resources.gyp
src/webengine/doc/src/qtwebengine-overview.qdoc
src/webenginewidgets/api/qwebenginepage.cpp
src/webenginewidgets/api/qwebenginescriptcollection.cpp
src/webenginewidgets/api/qwebenginescriptcollection_p.h
tests/auto/widgets/qwebenginepage/BLACKLIST
And readded newly in 5.6 enabled tests to the BLACKLIST.
Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
Diffstat (limited to 'tests/auto/quick/quick.pro')
| -rw-r--r-- | tests/auto/quick/quick.pro | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index b278808f6..d220348ab 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -4,7 +4,10 @@ SUBDIRS += \ inspectorserver \ publicapi \ qquickwebenginedefaultsurfaceformat \ - qquickwebengineview \ - qquickwebengineviewgraphics + qquickwebengineview -isQMLTestSupportApiEnabled(): SUBDIRS += qmltests +isQMLTestSupportApiEnabled() { + SUBDIRS += \ + qmltests \ + qquickwebengineviewgraphics +} |