summaryrefslogtreecommitdiffstats
path: root/src/designer/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-184-17/+16
| | | | | | | Plus additional adjustments. Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-183-4/+4
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
| * Qt Designer: Migrate from QList to QVectorFriedemann Kleint2019-12-093-4/+4
| | | | | | | | | | Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Port the rest of QtToolsLeander Beernaert2019-12-124-2/+84
| | | | | | | | | | | | Change-Id: I4115bde9af38219682d0e6707bc7aa8fcb8d6bb0 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-12-091-1/+1
|\| | | | | | | Change-Id: I6368c62aaf33bff9d9f41d7830ee7411c2cfd827
| * Remove usages of deprecated APIsSona Kurazyan2019-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | Replaced: QColor::dark() -> QColor::darker() QImage::byteCount() -> QImage::sizeInBytes() qMemCopy() -> memcpy() Task-number: QTBUG-76491 Change-Id: I5f820454fdb494a28df3f44a37e81ccd622104bd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Regenerate projectsAlexandru Croitor2019-11-151-2/+2
| | | | | | | | | | | | Change-Id: If18187b15a506fb6fda6b2d0c7d6943e806ec252 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Regenerate before mergeAlexandru Croitor2019-10-151-3/+0
| | | | | | | | | | Change-Id: I857f2c966240b5e056e30531b4bc3e2fc9c68e8e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Port QtDesigner to CMakeAlexandru Croitor2019-08-282-0/+45
|/ | | | | | Task-number: QTBUG-76002 Change-Id: I3bbcd6cca1399b277981a2fc2ea34ec5995f1dc2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Qt Designer: Replace Q_DISABLE_COPY by Q_DISABLE_COPY_MOVEFriedemann Kleint2019-06-031-1/+1
| | | | | | | | Fix clang warnings like: warning: class '...' defines a default destructor, a copy constructor and a copy assignment operator but does not define a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions Change-Id: I12ead44ddea8f6f69d75f99bea61e69ecac36db4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Introduce nullptrFriedemann Kleint2019-06-051-1/+1
| | | | | | | 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-112-2/+1
| | | | | | | | | | | 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>
* 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>
* 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: Fix Qt include statementsFriedemann Kleint2018-05-2318-61/+60
| | | | | | | | | | | | 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: Raise minimum supported MSVC version to 2015Friedemann Kleint2018-01-081-4/+0
| | | | | | | | Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: I9c1d86c111c112359d7d5ad4ce9cd83f8939806b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2210-59/+59
| | | | | Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt Designer: Remove foreachFriedemann Kleint2017-01-101-4/+4
| | | | | | | Use range based for. Change-Id: I61a51aad99a9b2a20263fa3fa5ed991ac899ff2e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Updated license headers and license testsAntti Kokko2016-06-1021-357/+252
| | | | | | | | | | | | | 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: Fix Clang warnings about missing/inconsistent overrides.Friedemann Kleint2016-04-081-2/+2
| | | | | | | | Add missing overrides and remove FormWindowBase::emitSelectionChanged() as it was hiding QDesignerFormWindowInterface::emitSelectionChanged(). Change-Id: I4d07e6d0012aed931b9cad88878f29d026f3b1e3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Port Qt Designer to Qt 5 signals & slot connection syntax.Friedemann Kleint2015-07-143-6/+6
| | | | | | | | 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: Disambiguate the modules where widgets come fromSze Howe Koh2015-05-292-2/+2
| | | | | | | | | | - QWebView is from "Qt WebKit Widgets", not "Qt WebKit", "Qt WebView" or "Qt WebEngine Widgets" - QQuickWidget is for Qt Quick 2, not Qt Quick 1 Change-Id: Ifd3395cbbe632b0d17b37658044318ddf04770c9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Fix the include for QQuickWidgetjkobus2015-05-221-1/+1
| | | | | | Task-number: QTBUG-46139 Change-Id: I499b2fdaaf2ca72350a83a5a8a75eac94f0bcd76 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Qt Designer: Introduce Q_DECL_OVERRIDE.Friedemann Kleint2015-05-139-46/+46
| | | | | | | | 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>
* move ui loader interfaces to own moduleOswald Buddenhagen2015-05-113-3/+3
| | | | | | | | | | | | | | | | | | | it's backwards to declare the interface as part of the designer library itself, as that obviously pulls in half of designer itself into custom widget plugins which should be perfectly usable from the stand-alone ui loader in uitools. also, designer isn't built for embedded systems, so the bundling needlessly limited the availability of widget plugins. so move the relevant headers into a separate include-only module. the designer module retains forwarding headers, as the old includes obviously need to continue working. [ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin instead of QT+=designer. This makes them usable on embedded systems. Task-number: QTBUG-44724 Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-1421-147/+147
| | | | | | | | | | 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-2521-397/+229
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Store changed status of the QAxWidget's "control" property correctly.Friedemann Kleint2014-03-181-4/+9
| | | | | | | | | Handle the case of it being PropertySheetStringValue. Task-number: QTBUG-37602 Change-Id: Iff54d6409ffabf48406fcfec96289848a42b3e55 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Add QQuickWidget as a Qt Designer plugin.Friedemann Kleint2014-03-156-0/+234
| | | | | | Change-Id: Ie0f87232db5eeab4b2f3c36cd5e209fce727a40d Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* whitespace fixesOswald Buddenhagen2014-01-201-1/+1
| | | | | | | | remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Qt Designer: Implement property() for QAxWidgetPropertySheet.Friedemann Kleint2013-11-082-0/+10
| | | | | | | | | | | Access the control property of the QAxWidget directly. Task-number: QTBUG-34592 Change-Id: I7d0971ad8fc265d0443da7ae72330e2b7f3a8d70 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix gcc warning about unused codeKai Koehne2013-05-221-0/+4
| | | | | Change-Id: I88bef60bb272319229a92481deec4ac9de9a0547 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove pointless INCLUDEPATHsOswald Buddenhagen2013-05-031-3/+0
| | | | | Change-Id: I8e8bfd391ef8b243e288094f5a02544efe1b2f49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* parallelize SUBDIRSOswald Buddenhagen2013-05-031-1/+0
| | | | | | Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-1/+1
|\ | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
| * Enable Active-X plugin in Qt Designer.Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-29733 Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Active X plugin: Fix setting a control by task menu.Friedemann Kleint2013-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The property is a QString when set by the menu or a PropertySheetStringValue when loading the form. Breakage introduced by 8695c1753964eeb06b5d9306010b56be5fc151c0 . Task-number: QTBUG-29234 Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-182-3/+2
|\| | | | | | | Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
| * Fix CONFIG of tool-plugins.Friedemann Kleint2013-02-111-1/+1
| | | | | | | | | | Change-Id: I09c9abb08ba9f1ba171bf468e6cbc9010aaf0b53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-311-2/+1
| |\ | | | | | | | | | Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7
| | * Fix the missing webview Qt Designer plugin.Tim Jenssen2013-01-111-2/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29031 Change-Id: Ie91ec524292358388586827acbd69ec2fed44072 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | ActiveQt Designer plugin: Load control string correctly.Friedemann Kleint2013-01-211-1/+3
|/ / | | | | | | | | | | | | Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* / Update copyright year in Digia's license headersSergio Ahumada2013-01-1019-19/+19
|/ | | | | | | 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>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-081-2/+2
| | | | | | Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix position of rendered QAxWidget in designer previewMiikka Heikkinen2012-12-141-1/+1
| | | | | | | | Added correct offset to render call. Task-number: QTBUG-28595 Change-Id: Iab9fecdcf48c8f72fe28ac1cae72bcd2ea5830e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add PLUGIN_CLASS_NAME to qttools pluginsMiikka Heikkinen2012-12-103-0/+3
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: I4e7c7b5342c7dde99580d42100c8b9d89b809515 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove dependency to ActiveQt sources in designer plugin.Miikka Heikkinen2012-12-071-7/+3
| | | | | | | | | | | Seems that building using qaxtypes.* directly from qtactiveqt repo is unnecessary, so remove them. Task-number: QTBUG-26848 Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix build of the Designer QAxWidget plugin.Friedemann Kleint2012-12-032-4/+4
| | | | | Change-Id: I8a1e08c627f7697ca4449f0c33b1ecbda08257b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-054-16/+4
| | | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. TEMPLATE, some CONFIG flags and TARGET munging are unnecessary, too. this contains a nasty hack for examples, as we don't want users to use the internal prf files. Change-Id: I9af75f3040fd45d87ec9daea27e00588796ebe81 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 17:03:08 +0000