diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 10:02:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 16:56:23 +0000 |
| commit | 4df389eb4f1ae10284c03023e923ce2164d46753 (patch) | |
| tree | 0bf380793f86b06cc92c3dcb12d858e199c7cd7d /src/printsupport | |
| parent | 02164e0288f714f1ea93afb32548548686773d1d (diff) | |
Re-generate affected cmake files and configure.json after the merge
This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.
Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/CMakeLists.txt | 113 |
1 files changed, 57 insertions, 56 deletions
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index def4d69c91..5cdd16aa90 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -82,62 +82,63 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog uic ) -# Resources: -set(qprintdialog_resource_files - "images/fit-page-24.png" - "images/fit-page-32.png" - "images/fit-width-24.png" - "images/fit-width-32.png" - "images/go-first-24.png" - "images/go-first-32.png" - "images/go-last-24.png" - "images/go-last-32.png" - "images/go-next-24.png" - "images/go-next-32.png" - "images/go-previous-24.png" - "images/go-previous-32.png" - "images/layout-landscape-24.png" - "images/layout-landscape-32.png" - "images/layout-portrait-24.png" - "images/layout-portrait-32.png" - "images/page-setup-24.png" - "images/page-setup-32.png" - "images/print-24.png" - "images/print-32.png" - "images/view-page-multi-24.png" - "images/view-page-multi-32.png" - "images/view-page-one-24.png" - "images/view-page-one-32.png" - "images/view-page-sided-24.png" - "images/view-page-sided-32.png" - "images/zoom-in-24.png" - "images/zoom-in-32.png" - "images/zoom-out-24.png" - "images/zoom-out-32.png" -) - -add_qt_resource(PrintSupport "qprintdialog" - PREFIX - "/qt-project.org/dialogs/qprintpreviewdialog" - BASE - "dialogs" - FILES - ${qprintdialog_resource_files} -) -set(qprintdialog1_resource_files - "images/status-color.png" - "images/status-gray-scale.png" -) - -add_qt_resource(PrintSupport "qprintdialog1" - PREFIX - "/qt-project.org/dialogs/qprintdialog" - BASE - "dialogs" - FILES - ${qprintdialog1_resource_files} -) - +if(QT_FEATURE_printdialog) + # Resources: + set(qprintdialog_resource_files + "images/fit-page-24.png" + "images/fit-page-32.png" + "images/fit-width-24.png" + "images/fit-width-32.png" + "images/go-first-24.png" + "images/go-first-32.png" + "images/go-last-24.png" + "images/go-last-32.png" + "images/go-next-24.png" + "images/go-next-32.png" + "images/go-previous-24.png" + "images/go-previous-32.png" + "images/layout-landscape-24.png" + "images/layout-landscape-32.png" + "images/layout-portrait-24.png" + "images/layout-portrait-32.png" + "images/page-setup-24.png" + "images/page-setup-32.png" + "images/print-24.png" + "images/print-32.png" + "images/view-page-multi-24.png" + "images/view-page-multi-32.png" + "images/view-page-one-24.png" + "images/view-page-one-32.png" + "images/view-page-sided-24.png" + "images/view-page-sided-32.png" + "images/zoom-in-24.png" + "images/zoom-in-32.png" + "images/zoom-out-24.png" + "images/zoom-out-32.png" + ) + + add_qt_resource(PrintSupport "qprintdialog" + PREFIX + "/qt-project.org/dialogs/qprintpreviewdialog" + BASE + "dialogs" + FILES + ${qprintdialog_resource_files} + ) + set(qprintdialog1_resource_files + "images/status-color.png" + "images/status-gray-scale.png" + ) + + add_qt_resource(PrintSupport "qprintdialog1" + PREFIX + "/qt-project.org/dialogs/qprintdialog" + BASE + "dialogs" + FILES + ${qprintdialog1_resource_files} + ) +endif() extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog SOURCES |