From 79d04aa9e3e9aa84d7378260519f9e9a6759dc41 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 9 Jul 2021 19:24:15 +0200 Subject: Add QtPdf to cmake build Port QtPdf to Qt6: * QtPdf,QtPdfWidgets,QtPdfQuick libs * QtPdfQuickPlugin, QtPdfPlugin (imageformat) plugins * widget and quick examples * qtpdf tests To fit gn cmake integration and new repo layout code is a bit reshuffled. Compared to qmke build following features are not ported yet: * ios fat libs * qtbase 3rdparty static dependencies WebEngine build can be skipped with setting QT_FEATURE_qtwebengine_build=OFF Note this patch needs follow up for 6.2 branch to disable qtpdf builds by default, since this should not part of qt 6.2 release. Pick-to: 6.2 Task-number: QTBUG-95353 Change-Id: I4dd9f3934bdd478fb6d2fa686074a24d91f09953 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/CMakeLists.txt | 7 ++++--- tests/auto/pdf/CMakeLists.txt | 6 ++++++ tests/auto/pdf/qpdfbookmarkmodel/CMakeLists.txt | 9 +++++++++ tests/auto/pdf/qpdfdocument/CMakeLists.txt | 9 +++++++++ tests/auto/pdf/qpdfpagenavigation/CMakeLists.txt | 8 ++++++++ tests/auto/pdf/qpdfpagerenderer/CMakeLists.txt | 9 +++++++++ tests/auto/pdf/qpdfsearchmodel/CMakeLists.txt | 8 ++++++++ 7 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 tests/auto/pdf/CMakeLists.txt create mode 100644 tests/auto/pdf/qpdfbookmarkmodel/CMakeLists.txt create mode 100644 tests/auto/pdf/qpdfdocument/CMakeLists.txt create mode 100644 tests/auto/pdf/qpdfpagenavigation/CMakeLists.txt create mode 100644 tests/auto/pdf/qpdfpagerenderer/CMakeLists.txt create mode 100644 tests/auto/pdf/qpdfsearchmodel/CMakeLists.txt (limited to 'tests/auto') diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 2227e6e46..1e5c1f6bd 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -12,6 +12,7 @@ if(QT_FEATURE_qtwebengine_widgets_build OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::WebEngineWidgets)) add_subdirectory(widgets) endif() -#if(QT_FEATURE_build_qtpdf AND QT_FEATURE_webengine_qtpdf_support) -# add_subdirectory(pdf) -#endif() +if(QT_FEATURE_qtpdf_build + OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::Pdf)) + add_subdirectory(pdf) +endif() diff --git a/tests/auto/pdf/CMakeLists.txt b/tests/auto/pdf/CMakeLists.txt new file mode 100644 index 000000000..1220581ca --- /dev/null +++ b/tests/auto/pdf/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(qpdfbookmarkmodel) +add_subdirectory(qpdfpagenavigation) +add_subdirectory(qpdfpagerenderer) +if(TARGET Qt::PrintSupport) + add_subdirectory(qpdfdocument) +endif() diff --git a/tests/auto/pdf/qpdfbookmarkmodel/CMakeLists.txt b/tests/auto/pdf/qpdfbookmarkmodel/CMakeLists.txt new file mode 100644 index 000000000..f0300ce7b --- /dev/null +++ b/tests/auto/pdf/qpdfbookmarkmodel/CMakeLists.txt @@ -0,0 +1,9 @@ +qt_internal_add_test(tst_qpdfbookmarkmodel + SOURCES + tst_qpdfbookmarkmodel.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::Pdf +) + diff --git a/tests/auto/pdf/qpdfdocument/CMakeLists.txt b/tests/auto/pdf/qpdfdocument/CMakeLists.txt new file mode 100644 index 000000000..4551fdb6c --- /dev/null +++ b/tests/auto/pdf/qpdfdocument/CMakeLists.txt @@ -0,0 +1,9 @@ +qt_internal_add_test(tst_qpdfdocument + SOURCES + tst_qpdfdocument.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::PrintSupport + Qt::Pdf +) diff --git a/tests/auto/pdf/qpdfpagenavigation/CMakeLists.txt b/tests/auto/pdf/qpdfpagenavigation/CMakeLists.txt new file mode 100644 index 000000000..12ece7507 --- /dev/null +++ b/tests/auto/pdf/qpdfpagenavigation/CMakeLists.txt @@ -0,0 +1,8 @@ +qt_internal_add_test(tst_qpdfpagenavigation + SOURCES + tst_qpdfpagenavigation.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::Pdf +) diff --git a/tests/auto/pdf/qpdfpagerenderer/CMakeLists.txt b/tests/auto/pdf/qpdfpagerenderer/CMakeLists.txt new file mode 100644 index 000000000..f4084cce1 --- /dev/null +++ b/tests/auto/pdf/qpdfpagerenderer/CMakeLists.txt @@ -0,0 +1,9 @@ +qt_internal_add_test(tst_qpdfpagerenderer + SOURCES + tst_qpdfpagerenderer.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::Pdf +) + diff --git a/tests/auto/pdf/qpdfsearchmodel/CMakeLists.txt b/tests/auto/pdf/qpdfsearchmodel/CMakeLists.txt new file mode 100644 index 000000000..2c3e744d0 --- /dev/null +++ b/tests/auto/pdf/qpdfsearchmodel/CMakeLists.txt @@ -0,0 +1,8 @@ +qt_internal_add_test(tst_qpdfsearchmodel + SOURCES + tst_qpdfsearchmodel.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + Qt::Pdf +) -- cgit v1.2.3