Revert "[calligra] Simply tell the code we don't have X11, even if we technically do."

This reverts commit 013087fbf14060ddafc5d63501a00f62c96b624b.
[update] Update to upstream HEAD
Squashed 'calligra/' changes from 27173b5..0bc3d40

0bc3d40 Make an option to build without X11 in xmlgui
5931c0d components: Add zoom-related properties to ViewController
43a9270 Make KoJsonTrader's plugin path detection slightly less naive by adding CMAKE_INSTALL_PREFIX
68d38ee components: Use the new enum types everywhere
e63a52fe components: Register the Enum objects as QML types
ed89e59 components: Add a single file with Enum objects that can be exposed to QML
d010586 components: Add .gitignore to ignore docs dir
9c94a61 components: Add Doxyfile and DoxygenLayout.xml for generating documentation

git-subtree-dir: calligra
git-subtree-split: 0bc3d4083787d76afdf94dec4557fd2b40030ce9
Merge commit 'a8a0db240150773d2d2e916c5a3304a6ac548d32'

Conflicts:
	calligra/kf5/xmlgui/CMakeLists.txt
	calligra/kf5/xmlgui/src/CMakeLists.txt
[packaging] Disable x11 support explicitly for Calligra