feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '1.0.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/debugger/gdbengine.cpp
This commit is contained in:
hjk
2009-02-17 17:56:18 +01:00
parent 815bec124a 7587f6e39f
commit f3141d99c4
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -296,12 +296,13 @@ void QtVersionManager::updateSystemVersion()
foreach (QtVersion *version, m_versions) {
if (version->isSystemVersion()) {
version->setPath(findSystemQt());
version->setName(tr("Auto-detected Qt"));
haveSystemVersion = true;
}
}
if (haveSystemVersion)
return;
QtVersion *version = new QtVersion(tr("System Qt"),
QtVersion *version = new QtVersion(tr("Auto-detected Qt"),
findSystemQt(),
getUniqueId(),
true);