Merge commit 'origin/1.3'

This commit is contained in:
con
2009-11-05 19:00:23 +01:00
34 changed files with 297 additions and 138 deletions

View File

@@ -521,11 +521,10 @@ QString QtVersion::toHtml() const
<< "</b></td><td>" << m_qmakeCommand << "</td></tr>";
updateVersionInfo();
if (m_defaultConfigIsDebug || m_defaultConfigIsDebugAndRelease) {
str << "<tr><td><b>" << QtVersionManager::tr("Default:") << "</b></td><td>";
if (m_defaultConfigIsDebug)
str << "debug";
str << "<tr><td><b>" << QtVersionManager::tr("Default:") << "</b></td><td>"
<< (m_defaultConfigIsDebug ? "debug" : "release");
if (m_defaultConfigIsDebugAndRelease)
str << "default_and_release";
str << " debug_and_release";
str << "</td></tr>";
} // default config.
str << "<tr><td><b>" << QtVersionManager::tr("Version:")