summaryrefslogtreecommitdiffstats
path: root/src/plugins/printsupport
Commit message (Collapse)AuthorAgeFilesLines
* QCupsPrintEnginePrivate: Use "true" for "landscape" optionVladislav Tarakanov2025-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | CUPS treats the "landscape" option as a boolean value (IPP_TAG_BOOLEAN). In this case, all values ​​other than "true", "on" and "yes" are considered as false. As a result, using an empty string as the value for the "landscape" option results in the print area still being portrait. Currently, the problem with printing landscape images (png, jpeg, etc.) in Qt programs (e.g. Okular, Gwenview) occurs on Fedora 41 and other distributions using cups-filters v2.0+. The patch adds passing the value "true" instead of an empty string for the "landscape" option, as CUPS expects for changing the orientation. Pick-to: 6.9 6.8 Change-Id: Ib7ad1e2debcfff10e673757c97ef5614fb59a6ca Reviewed-by: Albert Astals Cid <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
* Replace QPair/qMakePair with std::pair in qtbase/pluginsIsak Fyksen2024-11-191-11/+11
| | | | | | | | | | As a drive-by replace calls to QList::append with emplace_back, to avoid repeating value_type. Pick-to: 6.8 Task-number: QTBUG-115841 Change-Id: I027d82706f3545dd63c6b8ba89ba66ae938e07f9 Reviewed-by: Marc Mutz <[email protected]>
* QCupsPrintEngine::setProperty(): defend against malformed PPK_CupsOptions valuesMarc Mutz2024-11-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The QCupsPrintEnginePrivate::closePrintDevice() function expects the cupsOptions string-list to have an even number of elements, because it iterates in steps of two and doesn't check the size of the container while in-between steps. Print a qWarning() in setProperty() when the option value string-list has an odd number of elements in it, and append an empty entry to maintain the expected format for closePrintDevice(). This is the least-intrusive way to fix the problem, hopefully defining previously undefined behavior without other user-visible effects. Amends f70924e9ccc016b979bc74bba156600639184be7, which, however, may have merely moved the code around. [ChangeLog][QtPrintSupport][QCupsPrintEngine] Fixed a bug where setting a value string-list with an odd number of elements as the PPK_CupsOptions value would read uninitialized data. Pick-to: 6.8 6.5 6.2 5.15 Change-Id: I38ed8de6da00f17fa8fe9138d54db3699943f3b1 Reviewed-by: Ahmad Samir <[email protected]> Reviewed-by: Ivan Solovev <[email protected]>
* Mark Cups::Cups optional target when building for non-APPLE systemsAlexey Edelev2024-09-241-1/+6
| | | | | | | | | | | | | | | | | | Relax the dependency on Cups for PrintSupport module on non-APPLE platforms. 30bb15e7bf42a07b49700b6e822513f125d9ed4d added the missing dependency for the PrintSupportPrivate target, but made it required. In general users not necessarly need the Cups found when linking PrintSupport on non-APPLE platforms. So we may mark Cups optional. We also need Cups as the required dependency when Qt is built statically, since then QCupsPrinterSupportPlugin will require the library to be found. Amends 30bb15e7bf42a07b49700b6e822513f125d9ed4d Pick-to: 6.5 6.7 6.8 Change-Id: Ia31d52f7beb9fab6ffa5123147a243f5be6345ef Reviewed-by: Alexandru Croitor <[email protected]>
* QCupsPrintEngine: handle a possible failure to open the cups fdGiuseppe D'Angelo2024-04-041-1/+14
| | | | | | | | I'm not familiar with CUPS APIs, so missing better judgment or a code comment, handle the possibility for a failure. Change-Id: I6f9afa9fdccaadbe199ce307f79e1d6050aa2939 Reviewed-by: Albert Astals Cid <[email protected]>
* Add CMYK support for pens/fills in the PDF engineGiuseppe D'Angelo2024-02-021-3/+6
| | | | | | | | | | | | | | | | | | | | | | | Insofar, painting with a CMYK color (pen/brush) was completely ignored by QPdfWriter, although the PDF format can faithfully represent CMYK colors. This commit adds support for CMYK colors in the PDF engine. The support is opt-in, in the name of backwards compatibility; an enumeration on QPdfWriter controls the output. QPrinter was using a hidden hook in QPdfEngine in order to do grayscale printing; this hook can now be made public API through the same enumeration. This work has been kindly sponsored by the QGIS project (https://qgis.org/). [ChangeLog][QtGui][QPdfWriter] QPdfWriter can now use CMYK colors directly, without converting them into RGB colors. Change-Id: Ia27c19ec81a58ab68ddc8b9c89c4e57d7d637301 Reviewed-by: Lars Knoll <[email protected]>
* Fix build with -no-feature-lineeditTasuku Suzuki2023-03-041-6/+6
| | | | | | | | Introduce a new feature for password dialog in cups that needs several widgets Pick-to: 6.5 6.5.0 Change-Id: I93799b814ac06e661c19cffcd7d3c9bfa56ff814 Reviewed-by: Volker Hilsheimer <[email protected]>
* Fix build with -no-feature-formlayoutTasuku Suzuki2023-02-211-5/+5
| | | | | | Pick-to: 6.5 Change-Id: I9f552942c206f16ef5e8b96cbf7255a54ff83470 Reviewed-by: Volker Hilsheimer <[email protected]>
* src: Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-102-9/+1
| | | | | | Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev <[email protected]>
* Port from container::count() and length() to size() - V5Marc Mutz2022-11-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); except that the on() matcher has been replaced by one that doesn't ignoreParens(). a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'. Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache, to avoid porting calls that explicitly test count(). Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22 Reviewed-by: Ivan Solovev <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-232-2/+2
| | | | | | | Task-number: QTBUG-105718 Change-Id: I5d3ef70a31235868b9be6cb479b7621bf2a8ba39 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Jörg Bornemann <[email protected]>
* Add license headers to cmake filesLucie Gérard2022-08-032-0/+6
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <[email protected]>
* Revert "CUPS: Add support for accessible IPP printers"Volker Hilsheimer2022-07-281-5/+2
| | | | | | | | | | This reverts commit 2f5f276b4a2a19b9f2669b84f28ce8e970aaa39f, after which valid printers are no longer listed anymore. Fixes: QTBUG-105242 Pick-to: 6.2 6.3 6.4 5.15 Change-Id: I6a388acff2a8033ad1052319edcf7e41a2f72c8f Reviewed-by: Oliver Eftevaag <[email protected]>
* Use SPDX license identifiersLucie Gérard2022-05-167-268/+16
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Lars Knoll <[email protected]> Reviewed-by: Jörg Bornemann <[email protected]>
* CUPS: Add support for accessible IPP printersLu YaNing2022-04-261-2/+5
| | | | | | | | | | | | CUPS 2.2 adds accessible IPP printers to the list of destinations that can be used. The "printer-uri-supported" option will be present for those IPP printers that have been recently used. https://github.com/OpenPrinting/cups/blob/master/cups/dest.c#L1611 Pick-to: 5.15 6.2 6.3 Change-Id: I49b4d2f1ee6d96e9bcc04ed1cc2ed48d7a6e7563 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Volker Hilsheimer <[email protected]>
* Printsupport: use _L1 for for creating Latin-1 string literalsSona Kurazyan2022-04-191-1/+3
| | | | | | Task-number: QTBUG-98434 Change-Id: I415132ed381c25313e7fcccd050e522667eb6c22 Reviewed-by: Volker Hilsheimer <[email protected]>
* Printsupport: stop using QL1Char constructor for creating char literalsSona Kurazyan2022-04-193-4/+4
| | | | | | | | Required for porting away from QLatin1Char/QLatin1String in scope of QTBUG-98434. Change-Id: Ia186ed178239796bdf19db5b35a36ea606baf937 Reviewed-by: Volker Hilsheimer <[email protected]>
* Fix UI mismatch when QPrinter::setDuplexZhang Hao2022-02-182-3/+9
| | | | | | | | | | | | | | | | | | Amends fa854f214a3c812e5548ff55d179dd07ef99053b. If user call QPrinter::setDuplex method, the QPrintDialog explicitDuplexMode value won't update. Fix this by: 1) handle device-specific default and value set in QPrinter in QCupsPrintEngine(Private) 2) handle the explicitly user-selected value in QPrintDialog(Private) Done-with: Michael Weghorn <[email protected]> Pick-to: 5.15 6.2 6.3 Fixes: QTBUG-99504 Change-Id: I1a471a8554e83aa4bec8bb95fcc95f9135b0ac8c Reviewed-by: Michael Weghorn <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
* CMake: Rename qt6_add_plugin TYPE option to PLUGIN_TYPEAlexandru Croitor2021-08-061-1/+1
| | | | | | | | | | | | | The intention is to remove TYPE as a keyword completely before 6.2.0 release, but in case if that's not possible due to the large amount of repositories and examples, just print a deprecation warning for now and handle both TYPE and PLUGIN_TYPE. Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: If0c18345483b9254b0fc21120229fcc2a2fbfbf5 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
* cmake: Don't give plugins PUBLIC usage requirementsCraig Scott2021-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. This change warns on any PUBLIC usage requirements specified for a plugin. This check is disabled by default to avoid spamming CI builds for repos that haven't been fixed yet. The check can be enabled by a CMake cache option, which is intended for developers to use locally when fixing this issue in other repos (all plugins in qtbase should not trigger this warning as a result of changes in this commit). Task-number: QTBUG-90819 Pick-to: 6.1 Change-Id: I09f2c8da77db1193ad3370f85d367dfc6ab7b9a6 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
* Remove .prev_CMakeLists.txt filesJoerg Bornemann2021-01-122-35/+0
| | | | | | | | | | Those serve no purpose anymore, now that the .pro files are gone. Task-number: QTBUG-88742 Change-Id: I39943327b8c9871785b58e9973e4e7602371793e Reviewed-by: Cristian Adam <[email protected]> Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Kai Koehne <[email protected]>
* Remove the qmake project filesJoerg Bornemann2021-01-072-27/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Kai Koehne <[email protected]>
* Windows: Build print support plugin directly into QtPrintSupportFriedemann Kleint2020-09-2411-1094/+0
| | | | | | Task-number: QTBUG-83259 Change-Id: I23042e1eb89d407692a96bfb2d6c4efdddbfb50f Reviewed-by: Tor Arne Vestbø <[email protected]>
* Silence warnings from using deprecated CUPS APIsLars Knoll2020-09-131-0/+6
| | | | | | | | | | Apparently these APIs don't have any replacements that we can use, so we have to continue to depend on them for now. Silence the compiler warnings related to them, to avoid unnecessary noise. Change-Id: I1838e3c82bedd31529fdad8debc577dca17613e5 Reviewed-by: Thiago Macieira <[email protected]>
* Add ; to Q_UNUSEDLars Schmertmann2020-07-073-4/+4
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint <[email protected]>
* Use QList instead of QVector in pluginsJarek Kobus2020-07-063-6/+6
| | | | | | Task-number: QTBUG-84469 Change-Id: Ic86f4a3000592a1c9ae62e4a83f4fe39832a6b24 Reviewed-by: Friedemann Kleint <[email protected]>
* CMake: Regenerate rest of projects under src/Alexandru Croitor2020-07-031-3/+0
| | | | | Change-Id: I7d7692306a80deb9e8d2a90454dad4b39320f380 Reviewed-by: Alexandru Croitor <[email protected]>
* Port QtPrintSupport to QStringViewLars Knoll2020-06-112-2/+2
| | | | | | Task-number: QTBUG-84319 Change-Id: I4a2407dcf1c2979cd109e7cb3dd7d6395c56b927 Reviewed-by: Thiago Macieira <[email protected]>
* macOS: Build print support plugin directly into QtPrintSupportTor Arne Vestbø2020-06-046-110/+0
| | | | | | Task-number: QTBUG-83259 Change-Id: I74f60519fbccfa5f208397bf3d65f0a4f64cb6f0 Reviewed-by: Volker Hilsheimer <[email protected]>
* Move macOS print support from platform plugin into QtPrintSupportTor Arne Vestbø2020-06-041-12/+4
| | | | | | Task-number: QTBUG-83256 Change-Id: I29044b6c3f952c259f501f94a175c8ef2cbaae55 Reviewed-by: Tor Arne Vestbø <[email protected]>
* CMake: Regenerate projects to match updated plugin APILeander Beernaert2020-04-273-3/+3
| | | | | Change-Id: Iafe0a953e74d7f36ec48fa075b3725dd6466c5e3 Reviewed-by: Alexandru Croitor <[email protected]>
* cmake: Remove APPLE prefix from platform namesTor Arne Vestbø2020-03-162-2/+2
| | | | | | | None of the other platforms have it. Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192 Reviewed-by: Alexandru Croitor <[email protected]>
* cmake: Fix naming when referring to Apple macOSTor Arne Vestbø2020-03-162-2/+2
| | | | | Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af Reviewed-by: Alexandru Croitor <[email protected]>
* Regenerate projects to correctly handle private dependenciesAlexandru Croitor2020-02-053-10/+8
| | | | | | | Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]>
* Regenerate plugin projects to get new target namesAlexandru Croitor2020-01-273-9/+9
| | | | | | | | | And also to get the original output names (qmake's "TARGET"), so that the plugin file names are as they were in Qt 5. Change-Id: I96a060d1a81693652847857372bec334728cb549 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <[email protected]>
* Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-241-2/+2
|\ | | | | | | Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
| * Replace usages of QVariant::value by qvariant_castOlivier Goffart2019-12-151-2/+2
| | | | | | | | | | | | | | This is done automatically with a clazy check Change-Id: I3b59511d3d36d416c8eda74858ead611d327b116 Reviewed-by: Lars Knoll <[email protected]>
* | Regenerate src/*Alexandru Croitor2019-11-143-3/+3
| | | | | | | | | | | | Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <[email protected]>
* | Regenerate everything under ./srcAlexandru Croitor2019-11-123-3/+0
| | | | | | | | | | | | | | Change-Id: Ibdbdc17f8c2ee41356f490dd839a47e1bcf4c586 Reviewed-by: Leander Beernaert <[email protected]> Reviewed-by: Simon Hausmann <[email protected]> Reviewed-by: Qt CMake Build Bot
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-3/+1
|\| | | | | | | Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
| * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-041-3/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qicucodec.cpp src/dbus/qdbusserver.cpp src/gui/painting/qbezier.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/printsupport/cups/qppdprintdevice.cpp Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a
| | * Fix -no-feature-mimetype buildAllan Sandfeld Jensen2019-08-191-3/+3
| | | | | | | | | | | | | | | Change-Id: I282f630d6e8a0b2b10fd1286d7a185a068abc9f1 Reviewed-by: Alexandru Croitor <[email protected]>
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-0/+2
|\| | | | | | | | | | | Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
| * | Fix build without features.mimetypeTasuku Suzuki2019-08-201-0/+2
| | | | | | | | | | | | | | | Change-Id: I9d3c20845b9ddecbafd6dfd756c5d17ae0c6b5fc Reviewed-by: Volker Hilsheimer <[email protected]>
* | | Regenerate printsupport pluginsAlexandru Croitor2019-10-084-12/+58
| | | | | | | | | | | | | | | | | | Change-Id: I3820d86bf4a36dd8ea53e5847c8d4de4b1ea9c61 Reviewed-by: Simon Hausmann <[email protected]> Reviewed-by: Qt CMake Build Bot
* | | cmake: Add missing CLASS_NAMEAlbert Astals Cid2019-10-031-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I5853578f427ae1d1b32ee5405694c216e2dd17cf Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <[email protected]>
* | | Add CMakeLists.txt for cocoa printsupport plug-inJean-Michaël Celerier2019-09-242-1/+26
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0cc8b2827e0986d9ef486f327e7d84362e7d99c4 Reviewed-by: Leander Beernaert <[email protected]> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <[email protected]>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-031-1/+2
|\| | | | | | | | | | | | | | | | | Take 5. Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
| * | Migrate Windows system libs to external dependenciesJoerg Bornemann2019-05-081-1/+2
| |/ | | | | | | | | | | Started-by: Oswald Buddenhagen <[email protected]> Change-Id: I211ce3252b836894aeeac1c85eb316d9596bca57 Reviewed-by: Oliver Wolff <[email protected]>
* | Write find_dependency() calls in Qt Module config filesAlexandru Croitor2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a new function called qt_find_package() which can take an extra option called PROVIDED_TARGETS, which associates targets with the package that defines those targets. This is done by setting the INTERFACE_QT_PACKAGE_NAME and INTERFACE_QT_PACKAGE_VERSION properties on the imported targets. This information allows us to generate appropriate find_dependency() calls in a module's Config file for third party libraries. For example when an application links against QtCore, it should also link against zlib and atomic libraries. In order to do that, the library locations first have to be found by CMake. This is achieved by embedding find_dependency(ZLIB) and find_dependency(Atomic) in Qt5CoreDependencies.cmake which is included by Qt5CoreConfig.cmake. The latter is picked up when an application project contains find_package(Qt5Core), and thus all linking dependencies are resolved. The information 'which package provides which targets' is contained in the python json2cmake conversion script. The generated output of the script contains qt_find_package() calls that represent that information. The Qt5CoreDependencies.cmake file and which which dependencies it contains is generated at the QtPostProcess stop. Note that for non-static Qt builds, we only need to propagate public 3rd party libraries. For static builds, we need all third party libraries. In order for the INTERFACE_QT_PACKAGE_NAME property to be read in any scope, the targets on which the property is set, have to be GLOBAL. Also for applications and other modules to find all required third party libraries, we have to install all our custom Find modules, and make sure they define INTERFACE IMPORTED libraries, and not just IMPORTED libraries. Change-Id: I694d6e32d05b96d5e241df0156fc79d0029426aa Reviewed-by: Tobias Hunger <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 07:32:52 +0000