summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2018-12-07 07:33:44 +0100
committerAndy Shaw <andy.shaw@qt.io>2018-12-07 13:57:51 +0000
commit0eb8ff632f0580f18a7b8de97dc0a2175f61943f (patch)
tree542896db3dc5774da8a207d08c724692d1884e1b
parent243807c53d4920a69022cc8f7d11edf59602d0ba (diff)
Only include the ssl example and test if the OpenSSL feature is available
Change-Id: I55cfc9bcf96b573a8d614d8fe11a9ad73615a525 Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
-rw-r--r--examples/remoteobjects/remoteobjects.pro5
-rw-r--r--tests/auto/auto.pro5
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/remoteobjects/remoteobjects.pro b/examples/remoteobjects/remoteobjects.pro
index 6d1ae2f..e1e0d63 100644
--- a/examples/remoteobjects/remoteobjects.pro
+++ b/examples/remoteobjects/remoteobjects.pro
@@ -5,8 +5,9 @@ SUBDIRS = \
cppclient \
modelviewclient \
modelviewserver \
- simpleswitch \
- ssl
+ simpleswitch
+
+contains(QT_CONFIG, ssl): SUBDIRS += ssl
qtHaveModule(quick) {
SUBDIRS += \
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index f80bdb2..6da145d 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -19,8 +19,9 @@ SUBDIRS += \
repparser \
subclassreplica \
sub_integration \
- sub_localsockettestserver \
- external_IODevice
+ sub_localsockettestserver
+
+contains(QT_CONFIG, ssl): SUBDIRS += external_IODevice
qtHaveModule(qml): SUBDIRS += qml
qtConfig(process): SUBDIRS += integration_multiprocess integration_external