diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-05 13:28:19 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-05-05 13:28:19 (GMT) |
| commit | 93415af11aeb879e68c46b9c4a470bbb898a4c59 (patch) | |
| tree | c80416a187f9bad51f3dfd84f7255c43ab760d62 /tools | |
| parent | b4bbb3d79a59c1225e1de58b6625f24de7df2013 (diff) | |
| parent | bfbf4d4ccdfb4cf35592c61674f6bffc28932787 (diff) | |
| download | Qt-93415af11aeb879e68c46b9c4a470bbb898a4c59.zip Qt-93415af11aeb879e68c46b9c4a470bbb898a4c59.tar.gz Qt-93415af11aeb879e68c46b9c4a470bbb898a4c59.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index bfa7445..e264426 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2373,7 +2373,7 @@ void Configure::generateBuildKey() + buildSymbianKey + "\"\n" "#else\n" // Debug builds - "# if (defined(_DEBUG) || defined(DEBUG))\n" + "# if (!QT_NO_DEBUG)\n" "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n" + build64Key.arg("debug") + "\"\n" "# else\n" @@ -3457,7 +3457,7 @@ void Configure::displayConfig() cout << "NOTE: When linking against OpenSSL, you can override the default" << endl; cout << "library names through OPENSSL_LIBS." << endl; cout << "For example:" << endl; - cout << " configure -openssl-linked OPENSSL_LIBS='-lssleay32 -llibeay32'" << endl; + cout << " configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl; } if( dictionary[ "ZLIB_FORCED" ] == "yes" ) { QString which_zlib = "supplied"; |