projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2614e16)
Don't include config.tests/unix/openssl/openssl.pri (again)
authorBradley T. Hughes <bradley.hughes@nokia.com>
Thu, 2 Feb 2012 11:02:15 +0000 (12:02 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 3 Feb 2012 00:40:07 +0000 (01:40 +0100)
This file was removed in commit ba9302b8a9b6b50f37987261c1ade9af2ade2d3c.
Commit 8fad23f3261bdcf9bd0e11980ebfc3b00c2469c6 removed openssl.pri from
src/network/ssl/ssl.pri, but not from the qsslsocket autotest.

Change-Id: Ic1a576ee7f0ee3d68471121ba636b94ce7bae455
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
tests/auto/network/ssl/qsslsocket/qsslsocket.pro patch | blob | history

diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index 2739a7e..a8763d6 100644 (file)
--- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
@@ -17,7 +17,6 @@ win32 {
 
 # OpenSSL support
 contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-    include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri)
     # Add optional SSL libs
     LIBS += $$OPENSSL_LIBS
 }
Domain: UI Framework / Uncategorized;