diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
| commit | 190fa97c83472863fd886e86f626ab8196ed51b3 (patch) | |
| tree | 49edb9f6a41d6c999c9bb43ae28911a8e7212757 /tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro | |
| parent | 3aa163491c9c8f28c88ac87cafc6418f2c0e46c5 (diff) | |
| parent | 5971e0918757737425151c39a5f81a238663a17a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/widgets/doc/src/addressbook-fr.qdoc
Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index 06fad48d5a..8a95e11780 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -3,8 +3,7 @@ CONFIG += parallel_test SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp !wince*:win32:LIBS += -lws2_32 -QT += core-private network-private testlib -QT -= gui +QT = core core-private network-private testlib TARGET = tst_qsslsocket_onDemandCertificates_static |