diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:39:46 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:39:46 (GMT) |
| commit | e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42 (patch) | |
| tree | a121e872fd29a1820300b11a0261bf4ac78482e9 /tools | |
| parent | 7b41d3937c4521ba74b421da26d3a61a7aa4aa6e (diff) | |
| parent | cb5e66d1d43c0cf452aff0e437a2ea9011c6b659 (diff) | |
| download | Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.zip Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.tar.gz Qt-e2a6bf8d1c69d86c939aafcf357d60dcaa5f3d42.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Conflicts:
configure.exe
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
| -rw-r--r-- | tools/qttracereplay/main.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8996ee1..cd3feec 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"); diff --git a/tools/qttracereplay/main.cpp b/tools/qttracereplay/main.cpp index 7261082..4760c43 100644 --- a/tools/qttracereplay/main.cpp +++ b/tools/qttracereplay/main.cpp @@ -177,6 +177,12 @@ int main(int argc, char **argv) return 1; } + QFile file(argv[1]); + if (!file.exists()) { + printf("%s does not exist\n", argv[1]); + return 1; + } + ReplayWidget *widget = new ReplayWidget(argv[1]); if (!widget->updates.isEmpty()) { |