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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
con
2011-04-18 13:57:07 +02:00
parent a10e3a04d0 d7e1d74aac
commit 5b02bf94a8
57 changed files with 9576 additions and 1683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -593,6 +593,7 @@ void Qt4DefaultTargetSetupWidget::setShadowBuildSupported(bool b)
{
// if shadow building is supported we want to enable it, unless we have a in source build
m_shadowBuildEnabled->setChecked(b && !m_hasInSourceBuild);
m_importLineButton->setVisible(b);
}
void Qt4DefaultTargetSetupWidget::setShadowBuildCheckBoxVisible(bool b)