diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:20 +0200 |
| commit | a3926bb9f1eb6884f718edc4d9c9a5cffd03b0c3 (patch) | |
| tree | f50d07fd51ec5c43b2ae1193fae02faf346e2dc5 /src/scripttools/debugging/qscriptdebuggerconsole.cpp | |
| parent | fb7fdcbdff7a92d7770b648fa2989327cc103edb (diff) | |
| parent | c2657d346455a5a7821fbfbe3b1107d7cf9b0949 (diff) | |
| download | qtscript-a3926bb9f1eb6884f718edc4d9c9a5cffd03b0c3.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7b010b4d38e9141c083c4e79b4dd0d30c170e07f
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerconsole.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerconsole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp index 297fa65..9968411 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp @@ -323,7 +323,7 @@ QScriptDebuggerConsolePrivate::~QScriptDebuggerConsolePrivate() delete commandEngine; } -/*! +/* Loads command definitions from scripts located in the given \a scriptsPath. */ void QScriptDebuggerConsolePrivate::loadScriptedCommands( @@ -351,7 +351,7 @@ void QScriptDebuggerConsolePrivate::loadScriptedCommands( } -/*! +/* Creates a job that will execute the given debugger \a command. Returns the new job, or 0 if the command is undefined. */ |