From ec532841421ec261ea30b22e26d12c5c77ef52a2 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 29 May 2009 13:39:41 +0300 Subject: Enabled runtime resolving of OpenSSL symbols by default in Symbian OS. We cannot use -openssl-linked to create official SIS packages, due to US export regulations or some legal issues. That's why Open SSL symbols are resolved at runtime. The runtime resolving of OpenSSL symbols is default behaviour on other platforms as well. --- configure.exe | Bin 868352 -> 1183744 bytes confqt.bat | 2 +- confsbsv2.bat | 2 +- tools/configure/configureapp.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.exe b/configure.exe index 65db048..f2a2cb5 100755 Binary files a/configure.exe and b/configure.exe differ diff --git a/confqt.bat b/confqt.bat index 5da9592..b1474a7 100644 --- a/confqt.bat +++ b/confqt.bat @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-abld -openssl-linked -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-abld -qt-sql-sqlite -system-sqlite -nokia-developer %* diff --git a/confsbsv2.bat b/confsbsv2.bat index 6c9bc1a..f3a8424 100644 --- a/confsbsv2.bat +++ b/confsbsv2.bat @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-sbsv2 -openssl-linked -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-sbsv2 -qt-sql-sqlite -system-sqlite -nokia-developer %* diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 40caff0..9b44fb5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1404,7 +1404,7 @@ void Configure::applySpecSpecifics() dictionary[ "FREETYPE" ] = "no"; dictionary[ "QT3SUPPORT" ] = "no"; dictionary[ "OPENGL" ] = "no"; - dictionary[ "OPENSSL" ] = "no"; + dictionary[ "OPENSSL" ] = "yes"; dictionary[ "STL" ] = "yes"; dictionary[ "EXCEPTIONS" ] = "no"; dictionary[ "RTTI" ] = "no"; -- cgit v0.12