diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-31 10:20:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-07 10:49:06 +0200 |
commit | 4444cae6e06c45e8f1f3d8702abde655f6175ba9 (patch) | |
tree | f35cce1682c6500ecc8b6bb5ec6ad61d480310d8 /tests/auto/quick/quick.pro | |
parent | 40d808b53ded6bc091d7f642450c5fb9b09d6131 (diff) | |
parent | 7aa99d8d5b0dbf024019e70bf39b7d15796e1080 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.qmake.conf
src/core/compositor/display_gl_output_surface_qsg.cpp
src/core/web_engine_context.cpp
tests/auto/quick/quick.pro
Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235
Diffstat (limited to 'tests/auto/quick/quick.pro')
-rw-r--r-- | tests/auto/quick/quick.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index e6dccae4d..4690047b7 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -21,5 +21,7 @@ qtConfig(webengine-testsupport) { !qtHaveModule(quickcontrols): SUBDIRS -= qmltests +qtConfig(ssl): SUBDIRS += qmltests_ssl + # QTBUG-66055 boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2 |