summaryrefslogtreecommitdiff
path: root/src/plugins/qmljstools/qmlconsoleedit.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move QmlConsole to Debuggerhjk2015-12-091-168/+0
| | | | | | | | | | | Now it is closer to its only user and possibly reusable for no-QML uses there. We also drop the QML/JS syntax checker. The application being debugged can already tell us about syntax errors. There is no need to duplicate that functionality. Change-Id: I2ba151f9f4c854c6119ba5462c21be40bddcebf9 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* QmlJS: Clean up QML console editorUlf Hermann2015-11-031-110/+6
| | | | | | | | | | Align the text between editing and display mode, and remove the dead code. The prompt sign does not have to be part of the text and the JS parser does not have to retain the code it parses. Change-Id: I6e41f4fbc2cc863c84677640826d8663bcc648fb Task-number: QTCREATORBUG-14931 Reviewed-by: hjk <hjk@theqtcompany.com>
* QmlJS: Lazy-load console items to allow for recursionUlf Hermann2015-08-251-4/+4
| | | | | | | | | | | | | Using Utils:TreeView automatically gives us the capability for loading item as they are expanded. This way we can show recursive structure in the console as well as load data from the debug server on demand. Also, properly print error messages received from unsuccessful command evaluations. Task-number: QTCREATORBUG-14931 Change-Id: I66d440eedd9723b04670169b27db1ee18f3f2891 Reviewed-by: hjk <hjk@theqtcompany.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>
* Fix keyboard selection shortcuts on Qml/JS ConsoleKai Koehne2014-09-041-2/+6
| | | | | | | Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011 Task-number: QTCREATORBUG-12956 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@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>
* Clean headers in QmlJsTools.Friedemann Kleint2013-04-031-1/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I22fb33b8589dcd2f4b880eb320d7fa86de8a6f67 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* QmlConsole: Remove zero width spaceAurindam Jana2013-03-051-4/+7
| | | | | | | | | | | | | Zero width space is inserted at every punctuation to serve as a potential line break. All occurrences should be removed before sending the expression to JS engine for evaluation. Task-number: QTCREATORBUG-8859 Change-Id: I170dfd5fb0f1122ed945bb2e5f77ecaad925004b Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlConsole: Fixes navigation issue with right arrow keyAurindam Jana2013-03-051-1/+1
| | | | | | | | When the cursor is just before the first element, the right key did not work. Change-Id: I0a00b0593d4a6450311253cc021c70a64f75b456 Reviewed-by: Kai Koehne <kai.koehne@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
* Remove internal class QmlConsoleModel from public header.Friedemann Kleint2013-01-301-0/+1
| | | | | Change-Id: Ie0ba0168c1973f8ffef193c6e32a9d3f34c25146 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Debugger: Remove the dependence on QmlJSToolsAurindam Jana2012-10-091-2/+4
| | | | | Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258 Reviewed-by: Christiaan Janssen <christiaan.janssen@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
* ScriptConsole: Missing HeadersAurindam Jana2012-10-051-0/+30
| | | | | Change-Id: I2090fb58442ae9382220e85515188656f74e7e21 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* ScriptConsole: Move from Debugger to QmlJSToolsAurindam Jana2012-10-051-0/+233
The console is now a part of qmljstools plugin. The console appears as an output pane. A dummy QScriptEngine evaluates expressions when a declarative debug session is not in progress. During a debug session, the expressions are evaluated by the debug services. Task-Number: QTCREATORBUG-7402 Change-Id: Ic2eeac44fb335c706be03b89f8672b0356efe984 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>