Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
This commit is contained in:
Eike Ziller
2015-01-08 10:38:20 +01:00
72 changed files with 4939 additions and 3784 deletions

View File

@@ -658,7 +658,7 @@ void HelpPlugin::slotOpenSupportPage()
void HelpPlugin::slotReportBug()
{
QDesktopServices::openUrl(QUrl(QLatin1String("https://bugreports.qt-project.org")));
QDesktopServices::openUrl(QUrl(QLatin1String("https://bugreports.qt.io")));
}
void HelpPlugin::doSetupIfNeeded()