Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
This commit is contained in:
Oswald Buddenhagen
2010-11-01 12:11:03 +01:00
39 changed files with 930 additions and 496 deletions

View File

@@ -525,7 +525,6 @@ void GettingStartedWelcomePageWidget::showFeature(int feature)
ui->detailsLabel->show();
ui->detailsLabel->setOpenExternalLinks(true);
}
ui->featuredImage->setScaledContents(true);
}
void GettingStartedWelcomePageWidget::slotNextFeature()