Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

src/plugins/valgrind/callgrind/callgrinddatamodel.cpp

@@ -186,7 +186,7 @@ QModelIndex DataModel::indexForObject(const Function *function) const
 }
 
 /**
- * Evil workaround for https://bugreports.qt-project.org/browse/QTBUG-1135
+ * Evil workaround for https://bugreports.qt.io/browse/QTBUG-1135
  * Just replace the bad hyphens by a 'NON-BREAKING HYPHEN' unicode char
  */
 static QString noWrap(const QString &str)

src/plugins/valgrind/callgrindtool.cpp

@@ -794,7 +794,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
     m_filterProjectCosts = action;
 
     // filter
-    ///FIXME: find workaround for https://bugreports.qt-project.org/browse/QTCREATORBUG-3247
+    ///FIXME: find workaround for https://bugreports.qt.io/browse/QTCREATORBUG-3247
     QLineEdit *filter = new QLineEdit;
     filter->setPlaceholderText(tr("Filter..."));
     connect(filter, SIGNAL(textChanged(QString)), m_updateTimer, SLOT(start()));

src/plugins/valgrind/callgrindvisualisation.cpp

@@ -54,7 +54,7 @@
 // Margin from hardcoded value in:
 // QGraphicsView::fitInView(const QRectF &rect,
 //                          Qt::AspectRatioMode aspectRatioMode)
-// Bug report here: https://bugreports.qt-project.org/browse/QTBUG-11945
+// Bug report here: https://bugreports.qt.io/browse/QTBUG-11945
 static const int FIT_IN_VIEW_MARGIN = 2;
 
 using namespace Valgrind::Callgrind;

src/plugins/valgrind/workarounds.h

@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 class QPalette;
 QT_END_NAMESPACE
 
-///FIXME: remove this once https://bugreports.qt-project.org/browse/QTCREATORBUG-3247 gets fixed
+///FIXME: remove this once https://bugreports.qt.io/browse/QTCREATORBUG-3247 gets fixed
 QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false);
 
 #endif // WORKAROUNDS_H