From 5486648a207764926474e2d759a06530a7520207 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Sep 2019 12:48:32 +0200 Subject: [PATCH] Regenerate src/printsupport Change-Id: I9aeb6408cac243c5b5c55b1f14db1f4ef90996f3 Reviewed-by: Leander Beernaert Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/printsupport/CMakeLists.txt | 90 ++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 5215961f61..8809fbb884 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -84,40 +84,60 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog ) # Resources: -add_qt_resource(PrintSupport "qprintdialog" PREFIX "/qt-project.org/dialogs/qprintpreviewdialog" BASE "dialogs" 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 "qprintdialog1" PREFIX "/qt-project.org/dialogs/qprintdialog" BASE "dialogs" FILES - images/status-color.png - images/status-gray-scale.png) +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} +) extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog @@ -142,7 +162,7 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APP dialogs/qprintsettingsoutput.ui dialogs/qprintwidget.ui INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR}/src/plugins/printsupport/cups + ${QT_SOURCE_TREE}/src/plugins/printsupport/cups ENABLE_AUTOGEN_TOOLS uic )