summaryrefslogtreecommitdiffstats
path: root/src/designer
Commit message (Collapse)AuthorAgeFilesLines
* Bump copyright yearJani Heikkinen2020-01-091-2/+2
| | | | | | Change-Id: I81c229523e0d896f25d6d961c9857b615218ecbb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 47b91fe6ce0e56e8abc8b2a5e1ba5dbf4453e9f8)
* Designer: write out minimumSectionSize property before current sizeChristian Ehrlicher2019-03-181-16/+18
| | | | | | | | | | Make sure that minimumSectionSize is handled before currentSectionSize so a current section size lower than the default minimum section is properly handled. The same is done for QtBase in 7aa1078ecb8afd96050771635c0d3fa4238d3338. Change-Id: Id33ff11ef35cc92e0adf13402dc847b8f45c38a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.12.1Liang Qi2019-01-087-3/+25
|\ | | | | | | | | | | | | Conflicts: qttools.pro Change-Id: Ibf247399306794b1d79ebbcd230b853896d0bc87
| * QList/Tree/TableWidgetEdit: use correct default flagsChristian Ehrlicher2018-12-246-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | The AbstractItemEditor was using the default flags from an QListWidgetItem as the default values for QList/Tree/tableWidgetItem which is wrong because the different classes have different default flags. This lead to an inconsistent behavior during runtime. E.g. a QTableWidgetItem was not editable but during runtime it was editable. This fix adds a new function to retrieve the correct default flags dependending on the selected widget type. Change-Id: I96e1dec5a459a4d746b469bd773ddb7526e65357 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0b3b98813053be4eaba2109e50bbd5258da209b7
| | * Update filesave.png iconsThiago Macieira2018-11-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Matches qtbase b5d249f9538bf3dc44f11879c2244deb5a37bf97. Fixes: QTBUG-71012 Change-Id: I36203b7dac414e3eb9effffd15667415e7d133cd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Qt Designer: Generate global includes for custom widget pluginsFriedemann Kleint2018-12-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate #include <QtQuickWidgets/QQuickWidget> instead of #include "QtQuickWidgets/QQuickWidget" Task-number: QTBUG-72641 Change-Id: I6f2870bbe95ac582fb2137fa3540c79cfe61d06c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Bump copyright year to 2019Kai Koehne2018-12-181-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-72635 Change-Id: If5acb99bff8715101ab338a694b9f2d61e066ea3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-2/+9
|\ \ | | | | | | | | | Change-Id: Ia61820d18d28e3ee24ff0568e763f94e53bee193
| * | Qt Designer: Fix crash when reloading forms with resourcesv5.12.0-rc2v5.12.0Friedemann Kleint2018-11-261-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qtools/548a75049efaa3f9b3087016e3e36cc9b4f23e2e caused icon/pixmap properties to leak when setting a null object on the property editor since the code removing the properties was not executed. Default to the active form window when trying to find a form window for the object in question and bail out with a warning if that fails. Fixes: QTBUG-71809 Task-number: QTBUG-68507 Change-Id: I3fd96dd9b72d822c47071286b641254530f1568d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Qt Designer: Add widgets.table to the uilib.pri fileFriedemann Kleint2018-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | Make the file visible in the IDE. Change-Id: Ide7011bae10bef7796edaf54294f5a33e17ede37 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Qt Designer: Overhaul the layouts manualFriedemann Kleint2018-11-131-35/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the introductory paragraph, add a link to the Layout Management overwiew. Distinguish between top level layouts and layout objects and move the section on top level layout above the other. Flesh out the sections on layouts and top level layouts. Mention the Shift-Click selection and on that occasion fix the shortcut for multiselection, which was fixed to conform to standards in Qt 4. Change-Id: Id8d8e28c77cbec07c7ac816e4425a8ce337b28c1 Fixes: QTBUG-70841 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Qt Designer: Add chapter "A Quick Start to Qt Designer" to TOCFriedemann Kleint2018-11-081-0/+1
|/ / | | | | | | | | | | | | | | | | It is so far only accessible from the introductory chapter which not everyone might read completely. Task-number: QTBUG-70841 Change-Id: I0cf983e81b2519a60e9123b7ea4f4a88469d4b9a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Qt Designer: Add QUndoViewFriedemann Kleint2018-10-282-0/+13
| | | | | | | | | | | | | | | | | | Fix an apparent oversight. QUndoView (since 4.2) showed up as custom widget in .ui files. It is a proper Qt class, though. Task-number: PYSIDE-797 Change-Id: I6d2ee62b64daa9564d2c75e1e6ea81d79859768a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Port to new configure systemFriedemann Kleint2018-10-2822-165/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the old QT_NO... define checks by the configure features where applicable. Join the sections for the QTimeEdit/QDateEdit (inheriting QDateTimeEdit). For the printer, introduce a define depending on the availability of the printsupport library and QPrintDialog (cf textedit example) to accommodate platforms that don't build QtPrintSupport. Task-number: PYSIDE-797 Change-Id: I752d99a19b55616fa2ac5c36fad803d6d861e327 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Use member initialization in class QDesignerActionsFriedemann Kleint2018-10-262-14/+6
| | | | | | | | | | | | | | | | | | This allows for some simplification in the follow-up patch porting to the new configure system. Task-number: PYSIDE-797 Change-Id: I5d4227fb946ac908717ffb08807762e5f1178ca2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Add missing overridev5.12.0-beta3Friedemann Kleint2018-10-171-1/+1
| | | | | | | | | | | | | | | | | | Fixes: qdesigner.h:70:10: warning: 'event' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] bool event(QEvent *ev); Change-Id: I09f027dc412b259fdb2edc8fdca6792a96237f65 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix build of the QWebView plugin when using split tarballsFriedemann Kleint2018-10-151-3/+0
| | | | | | | | | | | | | | | | The offending includes are not required, so remove them. Fixes: QTBUG-70948 Change-Id: I365df84659f0bb02f8d6cbe06298b79e1e23ab28 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Make font point size combo in Device Profile dialog editableFriedemann Kleint2018-09-212-2/+11
| | | | | | | | | | | | | | | | | | The box was populated using QFontDatabase::standardSizes(), which varies by platform. Task-number: QTBUG-70430 Change-Id: Ie19359bea1e517af206e0d0dfc770668566b4fa0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-111-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/macdeployqt/shared/shared.h src/qdoc/sections.cpp Change-Id: I708a20d0061e82b99ecced7d24e7a2b8c475f706
| * Qt Designer: Fix crash when reloading resourcesFriedemann Kleint2018-08-211-0/+1
| | | | | | | | | | | | | | | | | | Initialize DesignerPropertyManager::m_object in the constructor Task-number: QTCREATORBUG-18342 Change-Id: I7acc7c12855b4775544a85fd000089cdcd6277af Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qt Designer: Fix some remaining clang-tidy warningsFriedemann Kleint2018-09-0311-25/+26
| | | | | | | | | | | | | | | | | | | | - Use QHash instead of QMap for pointer type keys - Use const ref to avoid copies - Fix C-style casts - Add parentheses to macro parameters Change-Id: I74c060fc32c6f7761582d81d219455b1e58c6ff9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Refactor WidgetFactory::isPassiveInteractor()Friedemann Kleint2018-08-012-46/+44
| | | | | | | | | | | | | | | | | | Factor out a helper routine to check on the widget so that the caching pattern becomes clearer. Change the heap-allocated QPointer<QWidget> to a static variable. Change-Id: I5dfc5a9ebc791dbd2e13a9cbde72f77c3e2c6104 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix clang-tidy warnings about loopsFriedemann Kleint2018-08-0120-91/+54
| | | | | | | | | | | | | | - Replace index-based loops by range-based for Change-Id: I074a52631cbf5233e1c762cee99064b8897abc30 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix clang-tidy warnings about if / return statementsFriedemann Kleint2018-07-3131-217/+193
| | | | | | | | | | | | | | | | | | | | - Simplify/streamline if statmenents (comparison against bool literal) - Change else if to if after return/break/continue - Fix indentation - Do not check for non-null before invoking delete on pointer Change-Id: I1b803b01cffd56b3f11e63c3e2e7ae103b1d8799 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix clang-tidy warnings about Qt usageFriedemann Kleint2018-07-3123-49/+87
| | | | | | | | | | | | | | | | | | | | | | - Use multi-arg form of QString::arg() - Fix static method calls - Prefer QFileInfo::exists() - Use isEmpty() for containers instead of checking size() - Use QOverload Change-Id: I31e92f77d0fa377932c1369afe2503abc8ecceac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Refactor FormWindowManager::getUnsortedLayoutsToBeBroken()Friedemann Kleint2018-07-312-8/+7
| | | | | | | | | | | | | | | | | | Change the return type from a QMap<QWidget *,bool> to a QSet<QWidget *> to fix a clang-tidy warning that a QHash should be used. The bool is redundant, though. Change-Id: Ib0bced9166cb6050e48195851abd6cb2b5109537 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix clang-tidy warnings about class definitionsFriedemann Kleint2018-07-31146-430/+295
| | | | | | | | | | | | | | | | | | | | | | - Use ' = default' for trivial constructors/destructors - replace virtual by override or add override where applicable - Return *this from assignment operators of custom iterators - Replace trivial constructors by member initialization for simple structs - Add Q_DISABLE_COPY Change-Id: I67fb07cb82ccba93a41d58a8a0782628c9c681d9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Simplify the form version checking codeFriedemann Kleint2018-07-251-17/+5
| | | | | | | | | | | | | | Replace parsing by QVersionNumber. Change-Id: I793a30f7d5746ea3f2644be94a2a57fbfb0f2769 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QUiLoader: Refactor QAbstractFormBuilder::applyTabStops()Friedemann Kleint2018-07-251-21/+13
| | | | | | | | | | | | | | | | | | | | Collect all widgets before applying the order and bail out if one cannot be found. The algorithm cannot do any meaningful if one is missing. Change the loop applying the order to a one-liner. Change-Id: I52a2d7e8252d346f6d697889e796c76f114a56f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-07-258-88/+140
|\| | | | | | | Change-Id: I08932d5a2599831a4cc53f5a70709d7c3a27a35b
| * Doc: Exclude parts of QtUiTools documentation based on the qdoc configVenugopal Shivashankar2018-07-242-0/+4
| | | | | | | | | | Change-Id: I4b0257108498efa2e10a1c4fa5deda3acb74187f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Qt Designer: Fix Qt Creator crashes on reloading malformed UI filesFriedemann Kleint2018-07-106-87/+137
| | | | | | | | | | | | | | | | | | | | | | | | Extract the functionality to read the DomUI with version check to QFormBuilderExtra so that the reading can be split into DomUI and widget creation. In FormWindow, check the success of the DomUI creation before modifying Qt Designer's internal state. Task-number: QTCREATORBUG-20742 Change-Id: I095f80e90966eba67d8994cd68e83c3e11aa0ee9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Modernize the ui4.cpp/.h filesFriedemann Kleint2018-07-242-440/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence clang-tidy warnings in the generated files - use nullptr [modernize-use-nullptr]: Use nullptr where applicable and simplify the switch() statement in write() on this occasion to use member variables instead of accessors. - use '= default' to define a trivial destructor [modernize-use-equals-default] Check if any delete statements are required. If not, use "= default". - use auto when initializing with new to avoid duplicating the type name [modernize-use-auto] Use auto. Change-Id: I48abfd8719b1ee66d68014cc02038a7decb70d4c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Unexport some QUndo-command classesFriedemann Kleint2018-07-091-26/+26
| | | | | | | | | | | | | | Remove export from classes that are not accessed by the components. Change-Id: I75c91d4428b63eee69297897a85b7382c4f21943 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: De-virtualize helper functions in container commandsFriedemann Kleint2018-07-091-12/+12
| | | | | | | | | | | | | | | | | | Remove virtual and change the visibility of the addPage()/removePage() helpers to protected. Apparently, introducing a class hierarchy for them was intended at some point, but never implemented. Change-Id: I571664210c33affc33fe0b1837f5c063241d47cc Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-041-0/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I91242ffea8752c3006c2aa28ac953ce74f4b6750
| * Qt Designer: Fix crash when morphing widgets with buddiesFriedemann Kleint2018-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | Bail out of PropertyEditor::setObject() when no form window can be found for the current widget, which can happen when setting the buddy property in morph macro sequences. Task-number: QTBUG-68507 Change-Id: I61955121d57e1c18e2ccf93d63e51d2df24f0827 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Use override in QUndoCommand-derived classesFriedemann Kleint2018-05-287-127/+127
| | | | | | | | | | | | | | Mark redo()/undo() and some destructors as override. Change-Id: Id45f8e5cb181e7ab3929ab952f2f27093ac23e21 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix Qt include statementsFriedemann Kleint2018-05-23380-2224/+2191
| | | | | | | | | | | | | | | | | | | | | | | | Change #include <QtCore/QDebug> to #include <QtCore/qdebug.h> according to the coding style. Change-Id: I2ba2e99d003f245c61ce836acb5af3208e1e0b29 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Improve error messages on form creation failuresFriedemann Kleint2018-04-181-2/+4
| | | | | | | | | | | | | | | | Add QTemporaryFile::errorString(). Task-number: QTBUG-67758 Change-Id: I611e0f0daa6a772553dec4b230266da566b1a953 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-184-4/+26
|\| | | | | | | Change-Id: I71af843e012fa9a4157cb082afba885aa5f0cddc
| * Doc: Fix documentation warnings for Qt DesignerTopi Reinio2018-04-104-4/+26
| | | | | | | | | | | | | | | | | | Add missing documentation for QDesignerFormWindowInterface, fix \fn commands and missing namespace specifiers. Change-Id: I3481781d30760768d4b79d8ea889c1c17b251f67 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-091-1/+2
|\| | | | | | | Change-Id: Ifa1d05c3f578d04db599c68ec96ef343e293fd51
| * Qt Designer: Write out idbased-attribute only when setFriedemann Kleint2018-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, all new forms saved will contain <ui version="4.0" idbasedtr="false"> which causes unnecessary changes and upsets older versions of uic. Amends 85624e87256005a2560a658722da5c982c8374ad. Task-number: QTBUG-34610 Change-Id: Ie688c5b9d1075bca96374d98b682dbbfb8bf7eca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer/generate_ui tool: Observe licenses of source filesFriedemann Kleint2018-03-283-120/+59
|/ | | | | | | | | | | | | | | Replace the hardcoded licenses in the .xsl files and replace by a special @LICENSE@ keyword. Read out the license from the source files in qttools/qtbase respectively and create temporary .xsl files with the keywords replaced accordingly. Use the same mechanism for the #include directive in the ui4.cpp source. Change-Id: I8a7937013041397954a30c676a9b699e0332a1e0 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Fix license of ui4.cppFriedemann Kleint2018-03-141-1/+0
| | | | | | | Amends 909a00a4f3d1882eb974ad2953024c4670e2e392. Change-Id: I13a0257d221d87eb7dc668f58f3bf5faf7218a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-181-1/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I83e2382427eb4a8ee0d52d3c4f379242ef80e09e
| * Bump copyright yearJani Heikkinen2018-02-061-1/+1
| | | | | | | | | | | | Task-number: QTBUG-65810 Change-Id: I3d9befbc56e1c7a63c383e872977e10d1eaa3734 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Release Qt UI Tools library under BSD licenseKai Koehne2018-02-1321-382/+651
| | | | | | | | | | | | | | | | | | | | | | | | | | The Qt UI Tools library is built statically by default. We should therefore release it under a more liberal license than BSD. This follows the example of the qtmain library, which is also available under BSD. [ChangeLog][Licensing] The Qt UI Tools library got relicensed to commercial + BSD. Change-Id: I0de0f5213305d148dcc64ab02177b92e99e3eb43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 02:59:15 +0000