Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
509 additions
and 160 deletions.
- +0 −3 src/core/CMakeLists.txt
- +169 −48 src/core/layout/qgscompositionconverter.cpp
- +18 −13 src/core/layout/qgscompositionconverter.h
- +1 −1 src/core/layout/qgslayoutmanager.cpp
- +1 −0 src/core/layout/qgslayoutobject.h
- +105 −41 tests/src/core/testqgscompositionconverter.cpp
- BIN ...rol_images/compositionconverter/expected_importComposerAtlas_0/expected_importComposerAtlas_0.png
- BIN ...positionconverter/expected_importComposerTemplateHtml_0/expected_importComposerTemplateHtml_0.png
- BIN ...ages/compositionconverter/expected_importComposerTemplate_1/expected_importComposerTemplate_1.png
- +41 −0 tests/testdata/layouts/2x_template_atlas.qpt
- +79 −0 tests/testdata/layouts/2x_template_html.qpt
- +95 −54 tests/testdata/layouts/sample_project.qgs
Oops, something went wrong.