Merge branch 'new-3.2' into 3.2: these are changes kept in master before we decided to skip 3.1.1 and go for 3.2 directly
Description
Description
Details
Details
- Committed
staniek Jan 6 2019, 9:30 PM - Parents
- R14:04cb1e93687c: Make sure we don't try to build maps on Windows, even if Marble is around (as…
R14:00351a797aac: TRIVIAL PluginsTest: fix "Qt WebEngine seems to be initialized from a plugin"… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 04cb1e93687c | bcooksley/staniek | Make sure we don't try to build maps on Windows, even if Marble is around (as… | Jan 6 2019 | |||
| 3da9d355b5d2 | D13713 | pino/staniek | Use QPageSize::name() for names of page sizes | Jan 6 2019 |