1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Fix (Open)SSL detection on WinCE

Browse Source 
"ssl" should be defined when "openssl" is defined, and WinCE should
default to autodetection of OpenSSL.

Change-Id: I5693923ba2d3fea1a670df556c107e6ff75e6575
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Andrew Knight 2015-07-30 10:59:48 +03:00 committed by Simon Hausmann
parent 9291e2e667
commit f2fbee5134
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -911,8 +911,10 @@ void Configure::parseCmdLine()
dictionary[ "OPENSSL"] = "no";
} else if (configCmdLine.at(i) == "-openssl") {
dictionary[ "OPENSSL" ] = "yes";
dictionary[ "SSL" ] = "yes";
} else if (configCmdLine.at(i) == "-openssl-linked") {
dictionary[ "OPENSSL" ] = "linked";
dictionary[ "SSL" ] = "yes";
} else if (configCmdLine.at(i) == "-no-libproxy") {
dictionary[ "LIBPROXY"] = "no";
} else if (configCmdLine.at(i) == "-libproxy") {
@ -1701,8 +1703,6 @@ void Configure::applySpecSpecifics()
dictionary[ "STYLE_WINDOWSCE" ] = "yes";
dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
dictionary[ "OPENGL" ] = "no";
dictionary[ "SSL" ] = "no";
dictionary[ "OPENSSL" ] = "no";
dictionary[ "RTTI" ] = "no";
dictionary[ "SSE2" ] = "no";
dictionary[ "SSE3" ] = "no";