diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
| commit | 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd (patch) | |
| tree | d5bdef5e9340c64bbcf16115beced802b4170dd8 /src/activeqt/container/qaxscript.cpp | |
| parent | 35c178c310ebb85a8959d116acd913e7c050c8df (diff) | |
| parent | 7e3a5fd664b02a537b7f5dcd73840c5c7a437519 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
Diffstat (limited to 'src/activeqt/container/qaxscript.cpp')
| -rw-r--r-- | src/activeqt/container/qaxscript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp index 8d1a697..b7a8862 100644 --- a/src/activeqt/container/qaxscript.cpp +++ b/src/activeqt/container/qaxscript.cpp @@ -696,7 +696,7 @@ QAxScript::~QAxScript() heuristically. If \a code contains the string \c {End Sub} it will be interpreted as VBScript, otherwise as JScript. Additional scripting languages can be registered using - QAxScript::registerEngine(). + QAxScriptManager::registerEngine(). This function can only be called once for each QAxScript object, which is done automatically when using QAxScriptManager::load(). @@ -869,7 +869,7 @@ QAxBase *QAxScript::findObject(const QString &name) /*! \fn void QAxScript::stateChanged(int state); This signal is emitted when a script engine changes state. - \a state can be any value in the QAxScriptEngineState enumeration. + \a state can be any value in the \c QAxScriptEngine::State enumeration. */ /*! |