Merge branch '3.2'

Authored by staniek on Jan 6 2019, 9:32 PM.

Description

Merge branch '3.2'

Merged Changes

CommitAuthorDetailsCommitted
a4fa5674dadbstaniek
Merge branch 'new-3.2' into 3.2: these are changes kept in master before we… 
Jan 6 2019
04cb1e93687cbcooksley/staniek
Make sure we don't try to build maps on Windows, even if Marble is around (as… 
Jan 6 2019
3da9d355b5d2D13713pino/staniek
Use QPageSize::name() for names of page sizes 
Jan 6 2019

Empty Commit

This commit is empty and does not affect any paths.