diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /examples/network | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'examples/network')
| -rw-r--r-- | examples/network/network.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/network/network.pro b/examples/network/network.pro index 3a269f16ae..d64b16c760 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -30,7 +30,6 @@ qtHaveModule(widgets) { } qtConfig(openssl): SUBDIRS += securesocketclient - qtConfig(openssl-linked): SUBDIRS += securesocketclient qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient } |