summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-05-29 10:39:41 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-05-29 10:39:41 (GMT)
commitec532841421ec261ea30b22e26d12c5c77ef52a2 (patch)
treef74a9f9d30075c28187cdc686a3f99290506887b
parent0e9566f108c1fa25914cbb7717d1701e8f163e01 (diff)
downloadQt-ec532841421ec261ea30b22e26d12c5c77ef52a2.zip
Qt-ec532841421ec261ea30b22e26d12c5c77ef52a2.tar.gz
Qt-ec532841421ec261ea30b22e26d12c5c77ef52a2.tar.bz2
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.
-rwxr-xr-xconfigure.exebin868352 -> 1183744 bytes
-rw-r--r--confqt.bat2
-rw-r--r--confsbsv2.bat2
-rw-r--r--tools/configure/configureapp.cpp2
4 files changed, 3 insertions, 3 deletions
diff --git a/configure.exe b/configure.exe
index 65db048..f2a2cb5 100755
--- a/configure.exe
+++ b/configure.exe
Binary files 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";