Merge branch '5.1'

Authored by kossebau on Jun 30 2017, 5:25 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. plugins/contextbrowser/contextbrowser.cpp

Merged Changes

CommitAuthorDetailsCommitted
6055d62d28dfkossebau
Move qRegisterMetaType calls into constructors of methods' classes 
Jun 30 2017