summaryrefslogtreecommitdiffstats
path: root/src/designer/src/components/formeditor/qdesigner_resource.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Fix potential crashes when using findChild<>Friedemann Kleint2021-01-081-1/+1
| | | | | | | | | | Extends 3f600283ecc9cfcfc65eabd305ad36fbce55dbce. Task-number: QTBUG-89926 Change-Id: Iac2adc26dff190380c4c8cf5610ebc0132efde2d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit e7af10cfabeac5d049130f137f54a0b0c9f6fdc4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Open Qt 5 forms using QComboBox::AdjustToMinimumContentsLengthFriedemann Kleint2021-01-041-5/+25
| | | | | | | | | | | | | | | | | The enumeration value was removed in Qt 6 by qtbase/1a342b2db14fa92bca717f5daff950b2eef869f7. Ignore it. Rewrite the functionality introduced by 7641fe2ecda840911db5cdc2a99c45e7a1bcd313 to use a helper function. Task-number: QTBUG-89093 Fixes: QTBUG-89700 Change-Id: Ib451efead32ae82ed6902080cbd30e9cf8702186 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 09b1fb4a3267ebd6dea48709b73105a0281e6b40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Open Qt 5 forms using QDockWidget::AllDockWidgetFeaturesFriedemann Kleint2020-12-031-0/+5
| | | | | | | | | | | | The enumeration value was deprecated by qtbase/f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 and removed in Qt 6. Ignore it as it is the default. Task-number: QTBUG-89093 Change-Id: Ibfcaaa8a19d2f0744b4ed3373c3926e923ba9bcc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 62a01a553ad94a60162bbe1fc64745f7c6d146ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Port away from deprecated QVariant::TypeFriedemann Kleint2020-10-281-8/+8
| | | | | Change-Id: Ie0f7364454047ca7c9715f8d48814d71334a3cde Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Adapt to latest changes in qtbaseJarek Kobus2020-09-031-1/+1
| | | | | | | | | Adapts to changes in: 1. QPalette / QFont regarding mask resolving. 2. QVariant::canConvert expecting now QMetaType instead of int. Change-Id: Ief7405a1639e4b060a13ee63cfe3ad13d77e66ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QDesigner: Use QList instead of QVectorJarek Kobus2020-06-091-9/+9
| | | | | | Task-number: QTBUG-84469 Change-Id: Icb0da4e9657c1e85632c12fa906cc75272d74306 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Revert "Qt Designer: Migrate from QList to QVector"Friedemann Kleint2020-06-081-7/+7
| | | | | | | | | | This reverts commit ee87edebe6f934ec915b7cb4a0f5a28f73e9f221. The official class name will be QList. Task-number: QTBUG-84469 Change-Id: Ia6c1f0ed64b3ef3d5b8e0c0435ec76fbe76f867b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Update dependenciesFriedemann Kleint2020-03-311-2/+3
| | | | | | | | | | | | | | Adapt to qtbase/bcaff2b06fc46fce8a3ae6d613c025c8d097229c merging the QAction classes, qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 merging the QShortcut classes and qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 moving the Undo framework to QtGui. Clean up include directives. Change-Id: Ib825f17284390c103d5ac2ae1f2c8fe65a534f1a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Qt Designer: No longer handle functions given for the DESIGNABLE property ↵Friedemann Kleint2020-01-061-1/+1
| | | | | | | | | attribute Remove the parameter from the introspection interface and its handling. Change-Id: I1957563808811371f51c00312906f7f52da458f6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Migrate from QList to QVectorFriedemann Kleint2019-12-091-7/+7
| | | | | Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix Qt API usageFriedemann Kleint2019-11-151-13/+13
| | | | | | | | | | | | Replace: empty() by isEmpty() front()/back() by constFirst()/constLast(), preventing detaching Streamline some code. Task-number: QTBUG-79896 Change-Id: Ic3f8414db79a83a30b55369a9352f332b41aa621 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Add a setting for calling connectSlotsByName()Friedemann Kleint2019-07-011-1/+7
| | | | | | | | | | | | | Add a boolean attribute to DomUI and a form setting, allowing for per-form migration to the Qt 5 connection syntax. [ChangeLog][Designer] A per-form setting for disabling generating calls to QObject::connectSlotsByName() has been added to support migrating forms to Qt 5 connection syntax. Task-number: QTBUG-76375 Change-Id: Id59d4689287fdec025c199e4efc87a919e37ae9e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix some clang warningsFriedemann Kleint2019-06-051-9/+10
| | | | | | | | | | | | | - else after return/break - Misleading indentation - Use reference for const-copies - Mixing const/non-const iterators - Unnecessary pointer check before delete - Unhandled enum value Change-Id: Iecc684d4acf4284b2cd6b1dbd14e392db7ea580c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Replace 'typedef' by 'using'Friedemann Kleint2019-06-051-1/+1
| | | | | | | | Apply Fixits by Qt Creator with some amendments (use Qt standard typedefs for QWidget/QObjectList and QOverload for slots). Change-Id: Icf0600d8e5381e83ae8037895c07a09d7e6b481a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Introduce nullptrFriedemann Kleint2019-06-051-57/+57
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove unused codeFriedemann Kleint2019-06-041-10/+3
| | | | | | | | | | | | Remove QDesignerMenu(Bar)::m_interactive and setters, which did not have any effect and other unused members. In helper function enumKeyOfObjectToValue(), remove the unused object pointers which are apparently some left-over from some old MSVC version requiring actual variables in template functions. Change-Id: If583ff4583be09601877acca80166384f0730fef Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix some remaining clang-tidy warningsFriedemann Kleint2018-09-031-2/+1
| | | | | | | | | | - 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: Fix clang-tidy warnings about if / return statementsFriedemann Kleint2018-07-311-9/+12
| | | | | | | | | | - 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-311-2/+3
| | | | | | | | | | | - 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: Fix clang-tidy warnings about class definitionsFriedemann Kleint2018-07-311-4/+2
| | | | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-07-251-4/+18
|\ | | | | | | Change-Id: I08932d5a2599831a4cc53f5a70709d7c3a27a35b
| * Qt Designer: Fix Qt Creator crashes on reloading malformed UI filesFriedemann Kleint2018-07-101-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | 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: Fix Qt include statementsFriedemann Kleint2018-05-231-30/+30
|/ | | | | | | | | | | | 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: 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: Support id-based translationsFriedemann Kleint2018-01-181-0/+10
| | | | | | | | | | | | | | | - Introduce a per-string id attribute and a global attribute indicating whether the form uses ids. - Introduce a new "id" subproperty in the property editor which is used depending on the form setting. - Add a settings to the form settings dialog. [ChangeLog][Qt Designer] Qt Designer now supports id-based translations. Task-number: QTBUG-34610 Change-Id: I9b0aa36fba0543960212a257e6aa2d9c23ab84c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-7/+7
| | | | | Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt Designer: Port Ui classes to QVectorFriedemann Kleint2017-05-021-24/+22
| | | | | | | | | | | Change the XSLT sheets to generate QVector instead of QList for the Dom* classes with the exception of QList<DomProperty *> since that affects the public interfaces of QAbstractFormBuilder (virtual methods computeProperties(), applyProperties()). Add fixme note for Qt 6. Change-Id: I7d1fb490f4537ea5df668d97526e6f96bacf7fe0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Use typedefs QObject/WidgetList where appropriateFriedemann Kleint2017-04-131-3/+3
| | | | | | | Remove the TabOrder typedef in MetaDataBaseItem. Change-Id: I75852ee6b6a71cee7fbbbd82653cd9069894f421 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove foreachFriedemann Kleint2017-01-101-17/+25
| | | | | | | Use range based for. Change-Id: I61a51aad99a9b2a20263fa3fa5ed991ac899ff2e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove use of Java-style map iteratorsFriedemann Kleint2016-10-311-3/+2
| | | | | | | Use STL style iterators instead. Change-Id: Id82546f667059c69521507f3a3b6b997de5cd6ba Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove use of Java-style list/vector iteratorsFriedemann Kleint2016-10-311-15/+11
| | | | | | | Replace by range-for or algorithms. Change-Id: I16e1f883bf1a774f46cb0c51fb16ce6d7d80b04e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Updated license headers and license testsAntti Kokko2016-06-101-17/+12
| | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Port Qt Designer to Qt 5 signals & slot connection syntax.Friedemann Kleint2015-07-141-2/+2
| | | | | | | | Use Qt 5 signals & slot connection with exception of private slots and tool classes from the shared directory. Change-Id: I2bf4bfbdff709d15c8ee4ae3de3039bf3d210d6a Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Qt Designer: Introduce Q_DECL_OVERRIDE.Friedemann Kleint2015-05-131-7/+7
| | | | | | | | Replacement done by a script and verified with clang 3.5 to not cause new warnings. Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-141-7/+7
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Do not compress QLayout-margin properties when writing UI files.Friedemann Kleint2012-11-231-35/+1
| | | | | | | | | | QLayout::margin is deprecated. [Do not cherry-pick to 4.8.] Task-number: QTBUG-27552 Change-Id: I8d25e31d3be0ad336557cc306c3c68e681f9033d Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* UiLoader: Map QLCDNumber::numDigits to QLCDNumber::digitCount'.Friedemann Kleint2012-10-081-1/+3
| | | | | | | | QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5. Task-number: QTBUG-27462 Change-Id: I95e26e84cb589fd6fca74255d22bf806ea14d12e Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-251-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtTools: Fix usage of deprecated QCoreApplication::translate.Friedemann Kleint2012-05-211-4/+4
| | | | | Change-Id: I7208cfd337c779f9f274315cf87dbc8853afcbaf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Qt Designer: Add translation-attributes to string list properties.Friedemann Kleint2012-01-201-1/+28
| | | | | | | | | | | | | - Add translation parameters to XML schema for ui. - Introduce PropertySheetStringListValue to property sheet, load & save code, add to property sheet and property editor. Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: Ib5e9e2e9ba603bb68984a102e3c3fc8ff1cb4df0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Qt Designer: Simplify code for translatable properties.Friedemann Kleint2012-01-061-98/+60
| | | | | | | | | | | | | Introduce base class for PropertySheetStringValue, PropertySheetKeySequenceValue, which allows for removing redundant code to set/retrieve the translation parameters to/from the DOM classes. Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: I5b65fff2bb27be82d04f96cf0d66652887b1c4b7 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061-1/+1
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Qt Designer/QtUiLoader: Remove support for QWorkspace.Friedemann Kleint2011-12-151-2/+1
| | | | | | | Change-Id: Ic0ffb13c5d30528800c1beae85d5224e8f2f7104 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* Qt Designer: Remove QScript extension.Friedemann Kleint2011-10-281-34/+1
| | | | | | Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Fix compilation with MSVC 2010.Friedemann Kleint2011-09-281-1/+1
| | | | | | | | | | Remove overzealous use of QStringLiteral. Adapt XSLT accordingly. Change-Id: I281a56feb299eaa0cca7dde25353c9bbd158909d Reviewed-on: http://codereview.qt-project.org/5700 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Fix string conversion warnings/introduce QStringLiteral.Friedemann Kleint2011-09-271-65/+65
| | | | | | | | on this occasion. Change-Id: Ib80dfdf8aae162b02500293a83e3bc12941f7406 Reviewed-on: http://codereview.qt-project.org/5637 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:42:06 +0000