compilation refinement for Qt5
Reset arguments in theorem definition to avoid argument clash (#8827)
Merge branch 'master' of git://git.lyx.org/lyx into my-two-cents

# By Juergen Spitzmueller
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  Reset arguments in theorem definition to avoid argument clash (#8827)
Merge branch 'my-two-cents' of github.com:apex-hughin/LyX into my-two-cents

* 'my-two-cents' of github.com:apex-hughin/LyX:
  compilation refinement for Qt5

Conflicts:
	CMakeLists.txt