lupdate confused by comment following namespace name

lupdate seems to parse namespace names a bit too greedily.
Example 1:

namespace foo // bla bla
{
  class bar : public QObject
  {
  Q_OBJECT
    void baz();
  };
}

void foo::bar::baz() { tr("bla bla"); }

lupdate says "Qualifying with unknown namespace/class: ::foo", but the ts file seems to be fine.
Removing the comment gets rid of the warning.

Example 2:

namespace foo // bla bla
{
  class bar : public QObject
  {
  Q_OBJECT
    void baz() { tr("bla bla"); }
  };
}

lupdate says "tr() can not be called without context", and the string is not present in the ts file.
Removing the comment gets rid of the warning, and the string appears in the ts file, but the context looks wrong (I suppose this is another bug, QTBUG-11742):

<context>
  <name>bar</name>
  ...
</context>