diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:08:59 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:40 +0100 |
commit | 258d019df60bc346a6fa89da694e52c4743dc18b (patch) | |
tree | 30a1a71f8ade0773ee6b0407a90ce9be5f438f1e /examples/examples.pro | |
parent | e66955ac63767cfad8c60de6faa8d367a8bc19f2 (diff) | |
parent | 29d9f1d867f84dede86cb41c27e38541a24186ff (diff) | |
download | qtwebsockets-258d019df60bc346a6fa89da694e52c4743dc18b.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7215c289188462383799269aa9b736ae76db4d25
Diffstat (limited to 'examples/examples.pro')
-rw-r--r-- | examples/examples.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 76a0e9f..158e1ce 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,12 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = echoclient \ - echoserver \ - simplechat -qtHaveModule(quick): SUBDIRS += qmlwebsocketclient - -contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { -SUBDIRS += \ - sslechoserver \ - sslechoclient -} +SUBDIRS = websockets
\ No newline at end of file |