Merge remote-tracking branch 'origin/2.6'

src/plugins/coreplugin/coreplugin.pro

@@ -4,9 +4,13 @@ DEFINES += CORE_LIBRARY
 QT += network \
     script \
     sql
-greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 
-CONFIG += help
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += help printsupport
+} else {
+    CONFIG += help
+}
+
 include(../../qtcreatorplugin.pri)
 include(../../libs/utils/utils.pri)
 include(../../shared/scriptwrapper/scriptwrapper.pri)

src/plugins/coreplugin/icontext.h

@@ -75,7 +75,7 @@ class CORE_EXPORT IContext : public QObject
 {
     Q_OBJECT
 public:
-    IContext(QObject *parent = 0) : QObject(parent), m_widget(0) {}
+    IContext(QObject *parent = 0) : QObject(parent) {}
 
     virtual Context context() const { return m_context; }
     virtual QWidget *widget() const { return m_widget; }