diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-16 17:23:28 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-11-17 09:45:35 (GMT) |
| commit | 009f01107fd062c1cd478fc9dbf20d927ff9c459 (patch) | |
| tree | a710357bbac08a142c73df060e402aeeb069a276 | |
| parent | 499a9aaabad0756cbca7b39751684308a6ba88ea (diff) | |
| download | Qt-009f01107fd062c1cd478fc9dbf20d927ff9c459.zip Qt-009f01107fd062c1cd478fc9dbf20d927ff9c459.tar.gz Qt-009f01107fd062c1cd478fc9dbf20d927ff9c459.tar.bz2 | |
configure.exe: fix when configured with -openssl-linked
before, when configured with -openssl-linked, configure.exe hang,
because of the following:
We were checking for XQMAKESPEC via something like
'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC
value to the dictionary. Later (line 3030), we checked whether
XQMAKESPEC was set (which was now true), and we used the value although
it was empty.
Reviewed-by: Thiago Macieira
Reviewed-by: Denis Dzyubenko
| -rwxr-xr-x | configure.exe | bin | 1173504 -> 1174528 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 7fe4a93..2c126df 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 735e030..3cd25ae 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2595,7 +2595,7 @@ void Configure::generateOutputVars() if (!opensslLibs.isEmpty()) qmakeVars += opensslLibs; else if (dictionary[ "OPENSSL" ] == "linked") { - if(dictionary[ "XQMAKESPEC" ].startsWith("symbian") ) + if(dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("symbian") ) qmakeVars += QString("OPENSSL_LIBS = -llibssl -llibcrypto"); else qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32"); |