aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/qmldesignerplugin.h
Commit message (Collapse)AuthorAgeFilesLines
* Add final specifies to classesIgor Sidorov2020-02-051-1/+1
| | | | | | | Warning -Wfinal-dtor-non-final-class in clang trunk Change-Id: I2bf17064bf8898eab10b82b69583a283157766d0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Avoid use of global object poolhjk2018-02-071-12/+4
| | | | | | | Plus some code cosmetics. Change-Id: I6fde62da5a99e750131d20336d35565280ac7bef Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add project tab to navigatorThomas Hartmann2018-02-021-0/+2
| | | | | | | | This makes navigation the project a lot easier and the layout of the side bars can be locked. Change-Id: I3ad7b85cb8704aedf8f5ec9ea9b2930c5a0986d1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add support for high dpi to form editor and puppetThomas Hartmann2017-03-131-0/+2
| | | | | | | | | | | | | We forward the device pixel ratio to the qml2puppet and render items in higher resolutions. We have to set the device pixel ratio on the pixmap manually, since it is not serialized. The option IgnoreDevicePixelRaio allows disabling high dpi awareness. Rendering in high dpi affects performance, but since we use shared memory this does not seem to be a serious issue. Change-Id: Ie9219b8fdb37841c24d4fb3f0ca259f0194ef65c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix indenting in embedded text editorThomas Hartmann2017-03-011-0/+1
| | | | | | | | We have to set the duplicated editor as the current editor. We avoid triggering a document change by using a flag. Change-Id: I22410ec2f3b24695b397525811940c8303e0ed87 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: refactor setup/integration codeTim Jenssen2017-01-271-1/+2
| | | | | | | | | | | | | - moved switchTextFormAction to shortcut manager - renamed createDesignModeWidget - remove unncessary DesignerSettingsKey::TEXTEDIT_IN_DESIGNMODE (supporting it in future would be too much effort) - using delayed registration inside QtCreator (which does not bring more speed, but more time for the codemodel in case of opening a qml.ui file directly) Change-Id: I1fd05f161e4bf4659c5a2fb09705b1f67d6f8e36 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: removed not used PluginManagerTim Jenssen2016-05-301-1/+0
| | | | | Change-Id: I549d2ec768fffb49922e8deab1a5e1a7f97e3c56 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: modernize code styleTim Jenssen2016-04-291-9/+2
| | | | | | | | | | - no behavior changes - using nullptr - renaming data -> d - transform single used small slot function to lambdas Change-Id: Ifae389b8a865b0b6a501b6f3d60597a66d9febe8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Fix after changing ModeManager::currentModeChangedEike Ziller2016-04-131-2/+1
| | | | | | Change-Id: Id71b0992fef9c0cb544d68078fb2b654777f0a2e Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* Wholesale conversion to #pragma oncehjk2016-03-301-4/+1
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner: add some overridesTim Jenssen2016-01-211-2/+2
| | | | | Change-Id: Ia3cdd1c33cda8de846e56aebcdca900f1bad03e4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-10/+10
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-181-12/+7
| | | | | | | | Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: Remove some unused class declarationshjk2015-08-281-8/+1
| | | | | Change-Id: I523e484bf1d071f6d09f68d481d61ec3f042e67f Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+1
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Refactor currentModel() getters in QmlDesignerPluginMarco Bubke2014-07-011-0/+1
| | | | | Change-Id: I6d5085b591439cc2e79ca0f9872a1c0497c5f220 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Refactor the rewriterView getters in the QmlDesignerPluginMarco Bubke2014-06-261-0/+1
| | | | | Change-Id: I01017b9e8f6ea5a444a6927756b8fb5370020e90 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Loading of the plugin in initializeMarco Bubke2014-04-171-12/+6
| | | | | | | No anymore in the constructor. Change-Id: I680e3d7e9c1ad103e78332fb1a54e15c7601fad9 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Switch to text mode if there is no qmlpuppetMarco Bubke2014-01-081-0/+3
| | | | | | Task-number: QTCREATORBUG-9390 Change-Id: I57da8b8b21fd14fe7e264f134ffa1f68eb9e06ce Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlDesigner: Move DesignerActionManagerView in ViewManagerMarco Bubke2013-09-191-0/+4
| | | | | Change-Id: I28d1e1aff0bcb3172494c133bf383582127f28c3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Clean headers in QML-Designer.Friedemann Kleint2013-04-301-1/+0
| | | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: export QmlDesignerPluginThomas Hartmann2013-03-141-1/+2
| | | | | | | Atm QmlDesignerPlugin is the hook to get access to the ViewManger. Change-Id: I97bc4bc6a079c586ba7ec54d1ca01c261f1d0e1d Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Refactoring document handlingMarco Bubke2013-01-231-26/+40
| | | | | | | | | | | | | | | | | | | | | | The document handling in the qml designer was complicated source code, which was initially intended for a non creator application. To integrate new views it has to be changed and cleaned up. This is the first major step in that direction. Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Fix crash on startuphjk2013-01-161-3/+2
| | | | | | | | | | | | | | | | | | | | Even in Magic Land it's a good idea to have an upper bound of one on the number of instances of a singleton types. Task-number: QTCREATORBUG-8578 Change-Id: I5c426493b85e0df9e2460ac2ef8f530be2847236 Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | qmldesigner: fixing testsFawzi Mohamed2013-01-161-2/+2
| | | | | | | | | | Change-Id: I2d98ea04860dfab083234904aa83f96cf6790472 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner: adding a nice dialog for warningsThomas Hartmann2012-11-211-1/+1
| | | | | | | | | | | | | | | | This patch also includes options to turn the warnings off. Change-Id: I540bc19f5a4f23f441af0fd08b072dbcbf067a20 Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner.Integration: Remove integration coreMarco Bubke2012-08-301-5/+3
|/ | | | | | | This class had only one function and was rather useless. Change-Id: I99fa64881cdf29cf074e6d4173eec6ea85cc2a2a Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
| | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* s/error_message/errorMessage/ghjk2011-09-211-1/+1
| | | | | | Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Merge branch '2.2'Oswald Buddenhagen2011-04-141-14/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp src/plugins/qt4projectmanager/qt4target.cpp src/plugins/qt4projectmanager/qt4target.h src/plugins/qt4projectmanager/qtoptionspage.h src/plugins/qt4projectmanager/qtversionmanager.cpp src/plugins/welcome/welcomemode.cpp
| * Update license.hjk2011-04-131-14/+13
| |
* | mode: make displayname, icon, priority, id, type data membershjk2011-04-141-4/+0
|/
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* core: use a class derived from QList<int> instead of a QList<int> for ↵hjk2010-06-251-1/+2
| | | | | | | | Core::Context A mostly mechanical change. Reviewed-By: con
* Fixed crash when opening ui files in design modeLasse Holmstedt2010-03-261-1/+2
| | | | | | | QML Designer now listens to contextChanged signal instead of modeChanged and checks that the context is same as that of qmldesigner. Reviewed-by: con
* Design mode switch: Bring back mode changed slot.Friedemann Kleint2010-03-161-0/+1
| | | | | to update Bauhaus correctly. Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
* Design mode: Give IEditor a 'preferred mode'.Friedemann Kleint2010-03-161-1/+0
| | | | | | | | | | | | | | | | ... and switch to it in EditorManager::activateEditor. There no longer is a need for special currentEditorChanged() handling in the editor that use a special mode. QmlDesigner receives an additional setting specifying the desired edit mode. QmlJSEditor detects whether QmlDesigner is present by checking the registered mimetypes of the Design mode and retrieves the settings via keys. Remove some obsolete code and clean up includes on qmldesignerconstants.h Reviewed-by: con
* Long live the king!hjk2010-03-051-1/+1
|