summaryrefslogtreecommitdiff
path: root/src/plugins/qmljstools/qmlconsoleview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move QmlConsole to Debuggerhjk2015-12-091-280/+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: Fix focus handling in QML/JS consoleUlf Hermann2015-11-031-3/+7
| | | | | | | | | We want the line editor to be focused by default when the console is opened either by mouse or by keyboard interaction. Change-Id: Ic366d1ac5f1306c0739c334584568402969895f3 Task-number: QTCREATORBUG-14931 Reviewed-by: hjk <hjk@theqtcompany.com>
* QmlJS: Lazy-load console items to allow for recursionUlf Hermann2015-08-251-8/+8
| | | | | | | | | | | | | 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>
* Clean exported headers of the Core plugin.Friedemann Kleint2015-03-051-0/+2
| | | | | Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Port to new connect apiMontel Laurent2015-01-301-1/+1
|/ | | | | Change-Id: I873a36601d54065b61d0666558b93dc839ad0dfc Reviewed-by: hjk <hjk@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QString(QLatin1String()) -> QString::fromLatin1()Alessandro Portale2014-05-091-1/+1
| | | | | Change-Id: I93bdd926ca1c7a37a298335711069d985f1f91dd Reviewed-by: hjk <hjk121@nokiamail.com>
* QmlConsoleView: Use Utils::TreeView to get consistent keyboard handlingDaniel Teske2014-04-161-14/+4
| | | | | Change-Id: I3b420d19602ab5e5bd9a4afd8aba7cffeca4089f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlJSConsole: Fix scrolling behaviorChristian Stenger2014-02-181-2/+2
| | | | | Change-Id: I3baaf8ac70661301a6f0947f4f8e79e97184a1a2 Reviewed-by: Aurindam Jana <aurindam.jana@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>
* QmlConsole: Save cycleshjk2013-11-081-0/+1
| | | | | Change-Id: I164449f83b6c24bdf89b0b770c9e19f32fe3f5be Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Qml Console view: Fix scrollingDaniel Teske2013-10-291-0/+2
| | | | | | | Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c Change-Id: I55b1ae8636a1c1cf1ed75f4d03b58ebf5bba511a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+2
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlJsTools: Compile fix for Qt 4.Friedemann Kleint2013-06-051-0/+1
| | | | | Change-Id: Ifaa78943be52d821bfbc3f32fb3fc914cf2d4315 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-06-051-2/+10
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmljstools/qmlconsoleitemdelegate.cpp src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
| * QmlConsole: Fix bug: Jump to location in editorAurindam Jana2013-06-041-2/+10
| | | | | | | | | | | | | | | | | | Since the file path starts with file:/// use QUrl to get local file name. Task-number: QTCREATORBUG-9337 Change-Id: Icf591fdcab8cb626cfbf844c451a2c87c07b853a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Move openEditorAt from BaseTextEditorWidget to EditorManagerEike Ziller2013-06-031-2/+2
| | | | | | | | | | | | | | More sensible place, gotoLine is a method in IEditor anyhow. Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8 Reviewed-by: David Schulz <david.schulz@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>
* | QmlJsTools: Remove unneeded #ifdef.Christian Kandeler2013-03-141-3/+3
|/ | | | | | | Replace compile-time check for host OS with runtime check. Change-Id: I78cd914e82a604c2c78fa6b679baa6a0392d2ed3 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* QmlConsole: Remove zero width spaceAurindam Jana2013-03-051-1/+1
| | | | | | | | | | | | | 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>
* 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 braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* Compile fix (QT_NO_CAST_FROM_ASCII).Friedemann Kleint2012-11-281-1/+1
| | | | | | Change-Id: I4db4135758f5cec8435fe0f11ab7141068b7cee3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QML/JS Console: Use Manhattan StyleAurindam Jana2012-11-271-5/+26
| | | | | Change-Id: Icae8039350a0d52d72fbf79bab850681e627d92f Reviewed-by: Christiaan Janssen <christiaan.janssen@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/+221
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>
View Lorry Controller Status