summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/rcc.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Update rcc.cpp/_p.hFriedemann Kleint2023-08-211-266/+792
| | | | | | | | 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>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-061-1/+1
| | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I234704ba429750ddee958a82f6c941d041da0653 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Port from container::count() and length() to size()Marc Mutz2022-10-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* Port from QLocale::Country to QLocale::TerritoryVolker Hilsheimer2022-03-211-15/+15
| | | | | | | | | | | | | Mostly a search and replace exercise, including the various internal data structures and variables that used to have "country" or "countries" in the name. No change to the DOM structure, where the territory is still stored in a "country" node. We'd have to keep both anyway to keep compatibility, and introducing support for either has no value. Change-Id: Icc2818615257d529e3401c0e28370560cdb3dc7e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Migrate away from QRegExpFriedemann Kleint2020-03-191-2/+12
| | | | | | | | | | | It will be moved to Qt5Compat, avoid depending on it where not necessary. Remove usages in Qt Designer, windeployqt and examples. Change-Id: I5f5efc6999e60d995ebbc81fcaf80e7be08711b2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* rcc.cpp: Use a QMultiHash explicitly if insertMulti() is being usedFriedemann Kleint2019-12-201-2/+2
| | | | | | | | | | | Apply the rcc part from qtbase/c7e35ffe69a73bb144618714313673f0d0c28394 to the copy of the rcc code used in Qt Designer, fixing: shared/rcc.cpp: In member function 'bool RCCResourceLibrary::addFile(const QString&, const RCCFileInfo&)': shared/rcc.cpp:605:47: warning: 'QHash<K, V>::iterator QHash<K, V>::insertMulti(const Key&, const T&) [with Key = QString; T = RCCFileInfo*]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ib9989db852a8e0333d508c055c9f2667d65d74e9 Reviewed-by: hjk <hjk@qt.io>
* Qt Designer: Prepare for deprecation of classes in Qt 6Friedemann Kleint2019-11-191-8/+6
| | | | | | | | | - Use auto for QStringRef. - Use auto for QList and iterators, refactoring some loops. Task-number: QTBUG-79896 Change-Id: I065d5b6d49404e51a10a7e1d7373eff41f9cb032 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Introduce nullptrFriedemann Kleint2019-06-051-5/+5
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix Qt include statementsFriedemann Kleint2018-05-231-11/+11
| | | | | | | | | | | | 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>
* Cleanup QRegExp includesSamuel Gaist2017-03-071-0/+1
| | | | | | | | | | This patch adds the missing QRegExp includes in prevision of the qtbase include cleanup. Change-Id: I25b66ac2cf71bdfa74612aa9dcd35ae9d0584f17 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Qt Designer: Remove foreachFriedemann Kleint2017-01-101-1/+2
| | | | | | | Use range based for. Change-Id: I61a51aad99a9b2a20263fa3fa5ed991ac899ff2e 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>
* Qt Designer: Replace some ugly typedefs by auto.Friedemann Kleint2015-08-241-3/+1
| | | | | Change-Id: Iec2248515840f458a86995208b3b5eb8eafcf15c 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>
* Remove QtAlgorithms usage from Qt Designer.Friedemann Kleint2013-09-251-2/+4
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I2c7057557295a9bbc83b3d7c625b04400d9e6c2a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.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>
* Generate a fatal error as appropriate.Stephen Kelly2012-07-171-1/+3
| | | | | | | | | | | | | | Otherwise, subdirectories under directories which are added to a resource file generate garbage in the binary. The easiest way to see this is cd tests/auto/corelib/kernel/qvariant mkdir stream/qt4.9/somedir make && ./tst_qvariant loadQt4Stream Change-Id: I92e4660ffe41c96b41a393cd0748d9b05517aa8b Reviewed-by: hjk <qthjk@ovi.com>
* Fix typo qith -> withStephen Kelly2012-07-161-1/+1
| | | | | | Change-Id: I71ee5f14c91f4265b71a1f097187408fb70f0867 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Qt Designer: Update copied rcc-code to contain the correct hash function.Friedemann Kleint2012-05-211-2/+2
| | | | | | | | | This fixes icons not showing in the resource editor or style sheets. See qtbase:ddb70bee2fd323ddc4273aec5d40d975f50d2904 Change-Id: I7c21dd738c1b75fbe071685dfb89f43a79c49ff9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove Qt Designer's dependency on rcc code from qtbase.Friedemann Kleint2012-03-281-0/+1049
Copy the files over. Change-Id: Iffe7e79a398c968901bf7f12e38af798bf4ca23d Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 04:28:24 +0000