summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add the missing global promotion exclution checks for zstdAlexey Edelev2024-05-281-1/+13
| | | | | | | | | | | | Add the missing global promotion exclution checks for zstd. Also ensure the raw zstd targets are promoted to global if they are found for the first time. Amends f57d15654b107f70c0ee853b82488ee0c329c3ba Fixes: QTBUG-119469 Change-Id: Ie05ae560243438c6d5d740ca138beff3f4201b80 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Qt Designer: Potential fix for Unity buildsFriedemann Kleint2024-05-134-4/+4
| | | | | | | | | | Fully qualify all classes in Ui namespaces. Fixes: QTBUG-120751 Task-number: QTBUG-115448 Pick-to: 6.7 Change-Id: Ic85fc5604b237ba84c2e4a9c50f4b94cdbb3037c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Use new qHash(QMap)Friedemann Kleint2024-04-241-4/+1
| | | | | | | | | Introduced by qtbase/e1f45ad8187947e243c8247c5cbac2d884d68d55. Amends 9b130f43b39e8bd0412530ab5b531d21eedaa4a4. Task-number: QTBUG-121823 Change-Id: I0ce26d7ca5e3cfbf16a265c56cea96ee45073375 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Add icon theme enums to the action editorFriedemann Kleint2024-04-152-16/+53
| | | | | | | | | | Rename the old string-based editor to XDG an add a new editor for the enumerations. Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: Iac32aaa75b558f564bb0add4a4747b5ac656eb6f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Add IconThemeEnumEditor and dialogFriedemann Kleint2024-04-152-18/+116
| | | | | | | Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: I4c838b469f925ab924d94520cb786114c86e3182 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use NO_GENERATE_CPP_EXPORTS explicitlyAlexey Edelev2024-03-251-0/+1
| | | | | | | | | | | Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need the autogenerated exports header file. Task-number: QTBUG-90492 Change-Id: Ib419fa559da8ff7f0368db5966a79f743dcfc45a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Fix code preview not working in PySide6 on WindowsFriedemann Kleint2024-03-191-1/+17
| | | | | | | | | | | | | PySide6 installations do not have a proper Qt directory structure on Windows; so, uic is not found via libexec. Use the path of the application instead, which should work in all cases. Fixes error Unable to launch ...\Lib\site-packages\PySide6\bin\uic: Process failed to start: The system cannot find the file specified. Pick-to: 6.7 6.6 Change-Id: I841836a89962f4db962816453b9e99f33ffaf86b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Prepare QToolBar handling for interaction with the form editorFriedemann Kleint2024-03-182-16/+30
| | | | | | | | | Make event filter of QToolBar more fine grained. Pick-to: 6.7 Task-number: QTBUG-120470 Change-Id: I4cb6cb0e91fb989abfa874419985adf696acf034 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Improve code previewFriedemann Kleint2024-03-181-1/+6
| | | | | | | | Set a fixed font and make it big enough to accommodate 100 characters. Pick-to: 6.7 6.6 Change-Id: I4f0353b33f344e92772cd659141e987d3d132659 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Save/restore theme icon valuesFriedemann Kleint2024-03-184-4/+138
| | | | | | | | | | | Use the existing "theme" attribute to store the theme enum name (fully qualified to be able to distinguish it from an old XDG/file name theme). Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: I7db33548b20caa86bef5103f9234a277fc21b5b1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Disable theme icons for macOSFriedemann Kleint2024-03-061-1/+3
| | | | | | | | | The mix of system icons and Designer's icons is perceived to look a bit off. Pick-to: 6.7 Change-Id: I684b5f4411d750850b288c2bb6f35bee057a0728 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Qt Designer: Use more theme iconsFriedemann Kleint2024-03-013-11/+22
| | | | | | | Pick-to: 6.7 Change-Id: I55957a16d354becfb59bd560458db6b9d1eb51a7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Silence -Wimplicit-fallthrough for clangTim Blechmann2024-02-292-0/+2
| | | | | | | | | Unlike gcc, clang warns about implicit fallthrough even if the following label only contains a `break` statement. Pick-to: 6.7 Change-Id: I4ad10cf25ab0f2149a7229f643dc53acd2bed492 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Port remaining usages of createIconSet() to L1Friedemann Kleint2024-02-289-22/+22
| | | | | | Pick-to: 6.7 Change-Id: I2172c86b534349d731c0dc96f49b8cba0473f482 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Refactor the icon loader helper function createIconSet()Friedemann Kleint2024-02-284-19/+42
| | | | | | | | | | | | | Split createIconSet(const QString &) into overloads for QLatin1StringView and QStringView (the latter mainly for QDesignerFormEditorInterface::createIcon(QString)). Add an overload that takes a QIcon::ThemeIcon value and returns the theme icon before going on a file search to replace the QIcon::fromTheme() calls. Pick-to: 6.7 Change-Id: I95d2c3d73139e330fcc86f404f176494a50c0ef3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QtHelp: More _L1Jarek Kobus2024-02-221-0/+3
| | | | | | | Task-number: QTBUG-122025 Change-Id: Icbdb003e9bd1b05bfb9d92002aab2aa5cc1aa0f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Rename 'Qt Designer' to 'Qt Widgets Designer'Friedemann Kleint2024-02-197-9/+9
| | | | | | Task-number: QTBUG-122253 Change-Id: I64b4b1deb758b716355159c4abb8f7ba914a3e1a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Qt Designer: Use \QD macro in documentationFriedemann Kleint2024-02-1517-25/+25
| | | | | | | Task-number: QTBUG-122253 Pick-to: 6.7 Change-Id: I108e94cf3e0097383de379dbf6f5d42561b55201 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Tools: Use theme icons in UIFriedemann Kleint2024-02-142-9/+9
| | | | | | | Pick-to: 6.7 Change-Id: I4592d1de6d46ea2f6d040642190f7e71a93d7045 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Refactor class PropertySheetIconValueFriedemann Kleint2024-02-072-20/+21
| | | | | | | | | | | Use the default for copy/assignment. Add missing move constructor/move assignment and fix up the debug operator. Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: Ic273a4da69eac155de8c018d8e67183cdf503fac Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Designer: Change the icon/pixmap caches to use QHashFriedemann Kleint2024-02-062-47/+43
| | | | | | | | | | | Instead of making PropertySheetPixmap/IconValue 3-way comparable types, change the maps to hashes. Task-number: QTBUG-103757 Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: I6b494da682ee4c065dcd86339dd4cb7c7591b829 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Qt Designer: Port const char * constants to latin1 literalsFriedemann Kleint2024-02-0322-371/+369
| | | | | | | | | | Run a script with some manual refactorings. It saves a few lengthy QLatin1StringView(). Task-number: QTBUG-121823 Pick-to: 6.7 Change-Id: I2c9ee5436fdcfbd249ce8d908c993d57f07a4fac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Refactor IconSelectorFriedemann Kleint2023-12-151-36/+35
| | | | | | | | | | | Address the fixme-comment and turn m_stateToName into a static array. Remove the m_stateToIndex and m_indexToState maps as well since the information is also in the m_stateToName list. Task-number: QTBUG-115841 Change-Id: Icce5db2b0f0c46e2a57113d9b74e57ab8275c6b3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: port away from QPairFriedemann Kleint2023-12-1524-78/+81
| | | | | | | | | Add fixme comment for public API. Pick-to: 6.7 Task-number: QTBUG-115841 Change-Id: Id518638b7112b68d5cbbcbb2b66ec9dbb7e3108b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Refactor class MetaEnumFriedemann Kleint2023-12-082-15/+22
| | | | | | | | Replace the QMap<QString,int> by a std::map<QString,int> which allows for heterogenous lookups using QStringView. Change-Id: I0bbfd3aaeeb79e1a90bc46858a407241dc5f47ac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove functions fixing enumeration valuesFriedemann Kleint2023-12-061-28/+20
| | | | | | | | | | | As QMetaEnum now supports arbitrarily scoped values, they are no longer required. Add a check. Task-number: QTBUG-118473 Task-number: QTBUG-118240 Change-Id: I06977899f8c43d8d08fc231f7e36f1134185fb46 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Use new comparison helpers for equalityFriedemann Kleint2023-12-0610-106/+127
| | | | | | Task-number: QTBUG-103757 Change-Id: I4b7c55e10c6fa2b09b1e6a0db9570022119f4ddc Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Write fully qualified enumerationsFriedemann Kleint2023-11-162-9/+9
| | | | | | | | | | | | [ChangeLog][Qt Designer] Qt Designer will output fully qualified enumeration values in .ui files to accommodate for scoped enums and Qt for Python. Task-number: PYSIDE-2492 Fixes: QTBUG-118473 Change-Id: I623beb26bdc169c3900e52bb69f27dc31eaf622a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Add enum name to meta flagsFriedemann Kleint2023-11-025-12/+16
| | | | | | | | | | | Add enumName() to the (private) QDesignerMetaEnumInterface and populate it from QMetaEnum. This is required for writing fully qualified enumeration values. Task-number: PYSIDE-2492 Task-number: QTBUG-118473 Change-Id: I1ad1c27e2b1c34c7a0d22f0e263513265e74a20b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Prepare for reading fully qualified enumeration valuesFriedemann Kleint2023-11-023-18/+34
| | | | | | | | | Task-number: PYSIDE-2492 Task-number: QTBUG-118240 Task-number: QTBUG-118473 Pick-to: 6.6 6.5 Change-Id: I8d9c8ddab555eca49f513069b98bf3871a0e28e6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Use initializer lists in QFormBuilderStringsFriedemann Kleint2023-11-011-16/+14
| | | | | | | Pick-to: 6.6 Task-number: QTBUG-118473 Change-Id: I3a3386af04b3fe70ad3cd9d249f36b15947fa15e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Convert remaining strings of QFormBuilderStrings into static ↵Friedemann Kleint2023-11-013-41/+30
| | | | | | | | | | | | | constants Use constexpr QLatin1StringView, which allows for using propertyByName() in more places since a QLatin1StringView fits QAnyStringView. Pick-to: 6.6 Task-number: QTBUG-118473 Change-Id: Icd1af76934d6528ecf0181d1cabbd1d045b845a2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Strip down class QFormBuilderStringsFriedemann Kleint2023-11-015-97/+42
| | | | | | | | | Remove strings that are not duplicated, trivial or unused. Task-number: QTBUG-118473 Pick-to: 6.6 Change-Id: I5fdb15d02e01194775f27f04d7c15ed15a46be6b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QAbstractFormBuilder: Remove some unnecessary DomPropertyHash conversionsFriedemann Kleint2023-11-014-79/+54
| | | | | | | | | | | | | | | | | | | | | This is the beginning of a series of patches to remove strings from class QFormBuilderStrings. In some QAbstractFormBuilder functions, the property lists are converted to a DomPropertyHash. In some cases, this was done for just one lookup. To avoid these conversions; add a helper to search for a DomProperty by name to QFormBuilderExtra. Add another helper QFormBuilderExtra::getLayoutMargins() for retrieving layout margins from DOM properties. With that in place, some string constants from QFormBuilderStrings can be removed. Pick-to: 6.6 Task-number: QTBUG-118473 Change-Id: Ieaed9cf14989a85f23b18186abe803fc8396897c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove class WidgetFactory::StringsFriedemann Kleint2023-10-312-85/+26
| | | | | | | | Pick-to: 6.6 Task-number: QTBUG-118473 Change-Id: Ib2a5c0e99a1aadb3b3fd473672f2c208d8a6d4b6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Include what you need: <QPointer>Marc Mutz2023-10-133-0/+3
| | | | | | | | | | | | | | | | | | | | | | | All these TUs relied on transitive includes of qpointer.h, maybe to a large extent via qevent.h, though, given that qevent.h is more or less the only public QtBase header that includes qpointer.h, something else seems to be at play here. Said qevent.h actually needs QPointer in-name-only, so a forward declaration would suffice. Prepare for qevent.h dropping the include. The algorithm I used was: If the TU mentions 'passiveGrabbers', the name of the QEvent function that returns QPointers, and the TU doesn't have qpointer.h included explicitly, include it. That may produce False Positives, but better safe than sorry. Otherwise, in src/, add an include to all source and header files which mention QPointer. Exception: if foo.h of a foo.cpp already includes it, don't include again. Task-number: QTBUG-117670 Change-Id: I4831812aaf571967292911de86ccca14c1d1bd5d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Re-enable generating of the deprecated Designer header filesAlexey Edelev2023-09-291-0/+3
| | | | | | | | | | | | | Some Designer header files were, moved to the UiPlugin module. Those header files should remain in Designer module as deprecated, but the mechanism that did this was broken during syncqt refactoring. Restore these deprecated files. Fixes: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: I72e3770f9114ee81a1dcfff2e3e356fb33d4460f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix zstd::libzstd_shared global target promotion issueAlexandru Croitor2023-09-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | The zstd target might be implicitly created by qt_find_package(WrapLibClang) in configure.cmake via the LLVMConfig.cmake file, because it has a dependency on zstd. Then we try to promote the target to global in the designer src subdirectory, which fails. Check if the target already exists, in which case we skip the global promotion. Similar to 381994598546131f262a3abac7fbcc325acfc7b5 in qtimageformats. Amends a0ecd3b3f7855cba3f8e91aff6617039e641da62 Pick-to: 6.6 Fixes: QTBUG-117145 Change-Id: I6e946f9fb8130d8e2513f164e99a1ac5dfb9c1ac Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Mark the whole repo with QT_NO_CONTEXTLESS_CONNECTAhmad Samir2023-09-211-1/+0
| | | | | | | | | | | By adding it to the default build flags via .cmake.conf. This amends commit feb042b7e9a8fe3f82d9659960464be31a34f8b2. Task-number: QTBUG-116296 Change-Id: I4b3db14eb9d77550bec90c32f75b547a8af22415 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix layout alignment context menu entry enabled stateFriedemann Kleint2023-08-221-1/+1
| | | | | | | | | | The action remained disabled when triggered a 2nd time after being invoked on a non-laid out widget. Pick-to: 6.6 6.5 6.2 Fixes: QTBUG-116305 Change-Id: I78badb41fb82a94f9e5ee3d8f7a99f9127c90bc7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Rename QPalette::AccentColor to QPalette::AccentAlexey Edelev2023-08-221-1/+1
| | | | | | Pick-to: 6.6 Change-Id: Id2afe4f57291af488000ab8dc69a15e9043a2079 Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
* Qt Designer: Update rcc.cpp/_p.hFriedemann Kleint2023-08-214-279/+854
| | | | | | | | Pick-to: 6.6 Change-Id: I7b11de95ae428963f8996718188db1758e492ad3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Qt Designer: Remove remaining (deprecated) QLatin1StringFriedemann Kleint2023-07-2528-241/+241
| | | | | | Pick-to: 6.6 6.5 Change-Id: I3f345fc366bb4d7a7844acfbf92b736565fc70df Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Change string constants from pointer to arrayFriedemann Kleint2023-07-2524-122/+122
| | | | | | Pick-to: 6.6 6.5 Change-Id: I9c772fb55611af68becc839edd9ce863c27b8162 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix a few unity build issuesFriedemann Kleint2023-07-259-29/+19
| | | | | | | | | | | | | Disambiguate some enumerations and variables. Add QT_PREPEND_NAMESPACE to more Ui namespaces. Amends eb46711c2000c11c5daf8c3704589c486c1141d2. Complements d0223dabe6922669519a0f7ed0704a13ce99951e. Pick-to: 6.6 6.5 Task-number: QTBUG-115448 Change-Id: Ifc0d14bb5e0cedb3bf61ab17ead2e928674b8693 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix invalid QIcon entry "<normaloff>.</normaloff>"Friedemann Kleint2023-07-241-1/+4
| | | | | | | | | | | | Prevent the pre-4.3 import code from triggering when a theme is present. Amends 6bcdb38b5bdf8f0176db3f372d4b8c8b14ba459f. Ignore the invalid "." value on loading broken forms. Pick-to: 6.6 6.5 6.2 5.15 Fixes: QTBUG-115465 Task-number: QTBUG-7777 Change-Id: I6187f82dec8d3bc4a613c1cc7de3ef7ceea47151 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QtDesigner: unbreak unity-build-batch-size 100000Marc Mutz2023-07-241-0/+13
| | | | | | | | | | | | | | | | | Exclude TUs that cause problems in a build where all of QtDesigner's .cpp files end up in a single unity_0_cxx.cxx. This should ensure that the build will forthwith not fail because someone added a new .cpp file in the "wrong" position. Of course, this is just a snapshot, with my configuration: Clang 15, Ubuntu 20.04, -developer-build, C++23, -sctp, libc++ (which means I can't link most of the tools, because of problems similar to QTBUG-115032). Task-number: QTBUG-115448 Pick-to: 6.6 6.5 Change-Id: I2363194bc2c9e07d75d58be7386dba9fb0778a2e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Build with QT_NO_CONTEXTLESS_CONNECTAhmad Samir2023-07-172-3/+4
| | | | | | | | | | | This disables the 3-arg QObject::connect() overload: QObject::connect(sender, signal, functor) For details see: https://lists.qt-project.org/pipermail/development/2023-July/044141.html Change-Id: If98ae8de59b12c46e88ac5d54ab380c95bd9b9f1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix remaining clazy/Axivion warnings about ↵Friedemann Kleint2023-06-292-4/+9
| | | | | | | | | | QMetaObject::connectSlotsByName() Fix oversights from c18520dc4f6ce8f0b8404c772e67ed094a15d086. Pick-to: 6.6 6.5 Change-Id: Ieb465f5e72605d02168ba8cda9422aaf91dc1241 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Add a way of specifying plugin pathsFriedemann Kleint2023-06-233-3/+16
| | | | | | | | | | | Add API for retrieving and replacing the default plugin paths. [ChangeLog][Qt Designer] Added API and command line options for modifying the plugin paths. Change-Id: I1bd18389d5a943045d114441a8c00bde8dee9f91 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: hjk <hjk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 13:06:43 +0000