summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/qtresourceeditordialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Port away from deprecated QVariant::TypeFriedemann Kleint2020-10-281-1/+1
| | | | | Change-Id: Ie0f7364454047ca7c9715f8d48814d71334a3cde Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Revert "Qt Designer: Migrate from QList to QVector"Friedemann Kleint2020-06-081-16/+16
| | | | | | | | | | 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>
* Qt Designer: Migrate from QList to QVectorFriedemann Kleint2019-12-091-16/+16
| | | | | Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Prepare for deprecation of classes in Qt 6Friedemann Kleint2019-11-191-17/+17
| | | | | | | | | - 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-33/+33
| | | | | | | 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-55/+27
| | | | | | | | | | | 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>
* Qt Designer: Fix clang-tidy warnings about if / return statementsFriedemann Kleint2018-07-311-16/+10
| | | | | | | | | | - 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-3/+10
| | | | | | | | | | | - 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/+4
| | | | | | | | | | | - 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: Fix Qt include statementsFriedemann Kleint2018-05-231-13/+13
| | | | | | | | | | | | 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: Convert more connect calls to Qt 5Friedemann Kleint2016-11-141-1/+2
| | | | | | | 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-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-62/+34
| | | | | | | Replace by range-for or algorithms. Change-Id: I16e1f883bf1a774f46cb0c51fb16ce6d7d80b04e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Fix gcc6 warning about unused functionsNikita Baryshnikov2016-07-111-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | «void qdesigner_internal::{anonymous}::Grid::swapCells(int, int, int, int)» defined but not used [-Wunused-function] «bool fulltextsearch::clucene::operator<(const fulltextsearch::clucene::QTextHtmlEntity&, const fulltextsearch::clucene::QTextHtmlEntity&)» defined but not used «bool fulltextsearch::clucene::operator<(const QString&, const fulltextsearch::clucene::QTextHtmlEntity&)» defined but not used «QList<{anonymous}::QtResourceFile*> {anonymous}::QtQrcManager::resourceFilesOf(const QString&) const» defined but not used «{anonymous}::QtQrcFile* {anonymous}::QtQrcManager::qrcFileOf({anonymous}::QtResourceFile*) const» defined but not used Change-Id: Iaf0a92130a6949956dc7cd87c2df5d8c540a86c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> 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>
* 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>
* 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>
* Port QStandardItem/QStandardItemModel includes to QtGuiGiuseppe D'Angelo2012-07-021-1/+1
| | | | | Change-Id: Ic2842dc4d1814e43b07faae0fd72fb2ce4ce1125 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtTools: Fix usage of deprecated QCoreApplication::translate.Friedemann Kleint2012-05-211-34/+34
| | | | | 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>
* 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-5/+5
| | | | | | | | 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-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+6
| |
* | 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-2/+3
| | | | | | QDesignerNewFormWidgetInterface QDesignerSettingsInterface QDesignerOptionsPageInterface
* Designer: BC corrections in QDesignerFormWindowInterface.Friedemann Kleint2011-05-131-2/+2
| | | | | | | Make active resource file sets and related functions available for IDE project integration. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+2223
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