diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-07 18:03:47 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-08 13:10:32 +0000 |
commit | 274571f6d56b2b05a61a42e6a5258f652e382bc6 (patch) | |
tree | 315bca629df79ef8d6162d4560ba3c4951f04a07 | |
parent | 115a76297b3c9f94b5258b42270228f06c96a575 (diff) | |
download | qtbase-274571f6d56b2b05a61a42e6a5258f652e382bc6.tar.gz |
Regenerate printsupport plugins
Change-Id: I3820d86bf4a36dd8ea53e5847c8d4de4b1ea9c61
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
-rw-r--r-- | src/plugins/printsupport/.prev_CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/plugins/printsupport/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/plugins/printsupport/cups/.prev_CMakeLists.txt | 31 | ||||
-rw-r--r-- | src/plugins/printsupport/cups/CMakeLists.txt | 16 |
4 files changed, 58 insertions, 12 deletions
diff --git a/src/plugins/printsupport/.prev_CMakeLists.txt b/src/plugins/printsupport/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5853d82c6a --- /dev/null +++ b/src/plugins/printsupport/.prev_CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from printsupport.pro. + +if(APPLE_OSX) + add_subdirectory(cocoa) +endif() +if(WIN32) + add_subdirectory(windows) +endif() +if(QT_FEATURE_cups AND UNIX AND NOT APPLE) + add_subdirectory(cups) +endif() diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt index df4167a2ae..22b753f5c0 100644 --- a/src/plugins/printsupport/CMakeLists.txt +++ b/src/plugins/printsupport/CMakeLists.txt @@ -1,11 +1,11 @@ -if (APPLE_OSX) +# Generated from printsupport.pro. + +if(APPLE_OSX) add_subdirectory(cocoa) endif() - -if (WIN32) -# TODO add_subdirectory(windows) +if(WIN32) + # add_subdirectory(windows) # special case TODO endif() - -if (UNIX AND NOT APPLE AND QT_FEATURE_cups) +if(QT_FEATURE_cups AND UNIX AND NOT APPLE) add_subdirectory(cups) endif() diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt new file mode 100644 index 0000000000..45fed90588 --- /dev/null +++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from cups.pro. + +##################################################################### +## cupsprintersupport Plugin: +##################################################################### + +add_qt_plugin(cupsprintersupport + TYPE printsupport + CLASS_NAME QCupsPrinterSupportPlugin + SOURCES + main.cpp + qcupsprintengine.cpp qcupsprintengine_p.h + qcupsprintersupport.cpp qcupsprintersupport_p.h + qppdprintdevice.cpp qppdprintdevice.h + INCLUDE_DIRECTORIES + ../../../printsupport/kernel + LIBRARIES + Cups::Cups + Qt::CorePrivate + Qt::GuiPrivate + Qt::PrintSupportPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::PrintSupport +) + +#### Keys ignored in scope 1:.:.:cups.pro:<TRUE>: +# MODULE = "cupsprintersupport" +# OTHER_FILES = "cups.json" +# _LOADED = "qt_plugin" diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index 85e9115747..9eb9e8eedd 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -17,13 +17,17 @@ add_qt_plugin(cupsprintersupport INCLUDE_DIRECTORIES ../../../printsupport/kernel LIBRARIES + Cups::Cups Qt::CorePrivate Qt::GuiPrivate - Qt::PrintSupport Qt::PrintSupportPrivate - Cups::Cups - # MODULE = "cupsprintersupport" - # OTHER_FILES = "cups.json" - # PLUGIN_CLASS_NAME = "QCupsPrinterSupportPlugin" - # _LOADED = "qt_plugin" + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::PrintSupport ) + +#### Keys ignored in scope 1:.:.:cups.pro:<TRUE>: +# MODULE = "cupsprintersupport" +# OTHER_FILES = "cups.json" +# _LOADED = "qt_plugin" |