In berryQtControlWidget
QtControlWidget(QWidget* parent, Shell* shell, Qt::WindowFlags f = nullptr);
should be
QtControlWidget(QWidget* parent, Shell* shell, Qt::WindowFlags f = 0);
In berryQtControlWidget
QtControlWidget(QWidget* parent, Shell* shell, Qt::WindowFlags f = nullptr);
should be
QtControlWidget(QWidget* parent, Shell* shell, Qt::WindowFlags f = 0);
[e5d189]: Merge branch 'bug-19103-wrong-cpp11-nullptr-replacement'
2015-05-28 14:07:14 Andreas Fetzer [2eee5b]
Replaced nullptr with 0 again
The latter branch is the right one. "++" in branch name is prevented by the git hooks