summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/qtresourceview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Refactor the icon loader helper function createIconSet()Friedemann Kleint2024-02-281-6/+6
| | | | | | | | | | | | | 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>
* Tools: Use theme icons in UIFriedemann Kleint2024-02-141-3/+3
| | | | | | | 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: Port const char * constants to latin1 literalsFriedemann Kleint2024-02-031-27/+27
| | | | | | | | | | 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: port away from QPairFriedemann Kleint2023-12-151-4/+4
| | | | | | | | | 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: Remove remaining (deprecated) QLatin1StringFriedemann Kleint2023-07-251-17/+17
| | | | | | 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-251-9/+9
| | | | | | Pick-to: 6.6 6.5 Change-Id: I9c772fb55611af68becc839edd9ce863c27b8162 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix clazy/Axivion warnings about QMap with pointer keysFriedemann Kleint2023-05-301-5/+6
| | | | | | | Pick-to: 6.5 Change-Id: Ia9a955893870ff1e83bba597932a65569ebfa450 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Use auto for iteratorsFriedemann Kleint2023-05-301-5/+2
| | | | | | | | | Remove some typedefs. Pick-to: 6.5 Change-Id: Ib7c45fcb35491215a2798a53051ea044f1ae3707 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Replace QLatin1Char by modern literalsFriedemann Kleint2023-04-211-2/+2
| | | | | | | Pick-to: 6.5 Change-Id: Ied11784e840d03542a5db281590729838ed625c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Qt Designer: Replace QStringLiteral by modern literalsFriedemann Kleint2023-04-071-6/+11
| | | | | | | | As a drive-by, extend the list of C++ keywords checked for naming. Pick-to: 6.5 Change-Id: I37b095d0fa29b9c431b7ad11bb5f962a8eeb5d79 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Qt Designer: Remove clearing of Qt::WindowContextHelpButtonHintFriedemann Kleint2023-03-211-1/+0
| | | | | | | | It is not set by default in Qt 6. Pick-to: 6.5 Change-Id: I5f474410d257e49422367c570ac6da4d56a08d22 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QtResourceEditor: Remove private slots - part 6Jarek Kobus2023-01-301-19/+22
| | | | | | Pick-to: 6.5 Change-Id: I6bf537115431247d14a17463ef2897d21af3ff69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Disambiguate static variables and functionsFriedemann Kleint2023-01-251-6/+6
| | | | | | | | | They cause conflicts in CMake Unity (Jumbo) builds. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I896678dd4c189c27b59b1338881702dcbe5f7e88 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-191-27/+2
| | | | | | | | | | | 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: I5335388c0472b0ee554234fc7eca60769e504660 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Qt Designer: Port away from deprecated QVariant::TypeFriedemann Kleint2020-10-281-1/+1
| | | | | Change-Id: Ie0f7364454047ca7c9715f8d48814d71334a3cde Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update dependenciesFriedemann Kleint2020-03-311-9/+11
| | | | | | | | | | | | | | 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: Introduce nullptrFriedemann Kleint2019-06-051-4/+4
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: introduce member initializationFriedemann Kleint2019-06-111-18/+10
| | | | | | | | | | | Fix warnings emitted by clang, use default constructors where applicable. Initialize remaining member variables about which clang warns about missing initialization in the constructor. Change-Id: Ic23a1f36f7507dc728ca6daf0d2067727125c0a9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QtTools: replace deprecated QLayout::margin() with contentsMargins()Christian Ehrlicher2019-02-111-1/+1
| | | | | | | | QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-231-1/+1
| | | | | Change-Id: Ia9258adbfed2b47e7c9d01354e23008d72566a4d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Port to new configure systemFriedemann Kleint2018-10-281-4/+4
| | | | | | | | | | | | | | | 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: Fix Qt include statementsFriedemann Kleint2018-05-231-25/+25
| | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-3/+4
|\ | | | | | | | | | | | | Conflicts: src/qdoc/qdocdatabase.h Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114
| * Qt Designer: Fix clazy-strict-iteratorsFriedemann Kleint2017-10-251-3/+4
| | | | | | | | | | Change-Id: I6a75c9e29e2c789ac12d9d7b065ec502a322683c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
|/ | | | | Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt Designer: Convert more connect calls to Qt 5Friedemann Kleint2016-11-141-3/+3
| | | | | | | Fix connect calls overlooked in previous refactorings. Change-Id: Ia8bd5634c1cdbbb1fbdc13aa4e7e3878a7206d55 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove use of Java-style map iteratorsFriedemann Kleint2016-10-311-18/+8
| | | | | | | 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-23/+17
| | | | | | | Replace by range-for or algorithms. Change-Id: I16e1f883bf1a774f46cb0c51fb16ce6d7d80b04e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-0/+2
|\ | | | | | | | | | | | | Conflicts: src/assistant/assistant/doc/src/assistant-manual.qdoc Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d
| * Designer: Fix the toolbar dimensions of the QtRescourceViewAlessandro Portale2016-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | The filter lineedit sits in a layout which has default contentmargins, also no toolbar icon size is set. Thich change sets the contentmargins to 0, and the icon size to 22 (like in other parts of Designer). the toolbar now looks good in Designer, as-well in Qt Creator. Change-Id: Ie722ff851fd9fecb36c9deba3662632fedf0080d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* Qt Designer: Introduce Q_DECL_OVERRIDE.Friedemann Kleint2015-05-131-1/+1
| | | | | | | | 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>
* Designer: Use QWidget::save/restoreGeometry() to position resource dialogs.Friedemann Kleint2014-12-161-3/+4
| | | | | | | | | | Using QRect as was done before might cause the dialogs to be restored out of screen if a screen is removed from a multimonitor setup. Task-number: QTBUG-43374 Change-Id: I48bb6e747da8042a8433d26e5e3bed267126ed3b Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
* Use QLineEdit's clear button feature in in Qt Designer.Friedemann Kleint2013-09-021-5/+10
| | | | | | | | | Remove old filter widget. Change-Id: Id65eee844d85df2d3c5a87f5acc26ba154d202c9 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* 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>
* Fix building designer shared with QT_NO_CLIPBOARDAndreas Holzammer2012-04-201-0/+8
| | | | | Change-Id: I25194a08f2b840276ec253d63f32cb39e3c69827 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.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>
* 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>
* Designer: Fix string conversion warnings/introduce QStringLiteral.Friedemann Kleint2011-09-271-6/+6
| | | | | | | | on this occasion. Change-Id: Ib80dfdf8aae162b02500293a83e3bc12941f7406 Reviewed-on: http://codereview.qt-project.org/5637 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/refactor' into masterLars Knoll2011-09-131-12/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/help/help.pro src/designer/src/components/formeditor/formwindow.cpp src/designer/src/components/formeditor/formwindow_dnditem.cpp src/designer/src/components/formeditor/layout_propertysheet.cpp src/designer/src/components/formeditor/qdesigner_resource.cpp src/designer/src/components/lib/lib.pro src/designer/src/components/signalsloteditor/signalsloteditor.cpp src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp src/designer/src/components/widgetbox/widgetbox_dnditem.cpp src/designer/src/components/widgetbox/widgetboxtreewidget.cpp src/designer/src/lib/lib.pro src/designer/src/lib/shared/qdesigner_formbuilder.cpp src/designer/src/lib/shared/qdesigner_propertysheet.cpp src/designer/src/lib/shared/shared.pri src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro src/linguist/lupdate/qdeclarative.cpp src/linguist/shared/profileevaluator.cpp src/linguist/shared/qph.cpp src/linguist/shared/ts.cpp src/qtconfig/mainwindow.cpp src/shared/qtgradienteditor/qtcolorline.cpp src/shared/qtgradienteditor/qtgradientwidget.cpp sync.profile Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
| * QtTools: Widget library split.Friedemann Kleint2011-05-241-12/+12
| |
* | Designer: Fix build warnings about missing QLatin1String().Friedemann Kleint2011-07-291-3/+3
| | | | | | | | | | | | | | Change-Id: I12d2f00de4bd5ed3fa2cd5448d6590f7179e98d4 Reviewed-on: http://codereview.qt.nokia.com/2392 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-241-17/+17
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Designer: Make some interfaces needed for IDE integration public.Friedemann Kleint2011-05-171-1/+1
| | | | | | QDesignerNewFormWidgetInterface QDesignerSettingsInterface QDesignerOptionsPageInterface
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+906
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 10:40:54 +0000