diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-04-22 13:32:42 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-04-22 15:21:40 +0000 |
| commit | 7dffc4f49a80e1e641a3b04fdd5aee082be39e5f (patch) | |
| tree | 05ac6fba87c09a1b068e6783677fbcb21f7448e1 | |
| parent | 65019ea1e1af0acc45517ef74f58bbd0efbba36e (diff) | |
| download | qtactiveqt-7dffc4f49a80e1e641a3b04fdd5aee082be39e5f.tar.gz | |
enable QAxScript on MinGW
[ChangeLog][ActiveQt] Enabled QAxScript on MinGW.
Change-Id: I90b56b02d1c90fada512e725aa6f498861a118f2
Task-number: QTBUG-45022
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/activeqt/container/qaxscript.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp index b7a8862..c1dfd34 100644 --- a/src/activeqt/container/qaxscript.cpp +++ b/src/activeqt/container/qaxscript.cpp @@ -42,7 +42,9 @@ #include "../shared/qaxutils_p.h" #if defined(Q_CC_GNU) -# define QT_NO_QAXSCRIPT +// Workaround for mingw-w64 bug #464 +// See https://sourceforge.net/p/mingw-w64/bugs/464/ +# define _NO_SCRIPT_GUIDS #elif defined(Q_CC_BOR) && __BORLANDC__ < 0x560 # define QT_NO_QAXSCRIPT #endif @@ -383,8 +385,7 @@ HRESULT WINAPI QAxScriptSite::EnableModeless(BOOL fEnable) Direct access to the script engine is provided through queryInterface(). - \warning This class is not available with the bcc5.5 and MingW - compilers. + \warning This class is not available with the bcc5.5 compiler. \sa QAxScript, QAxScriptManager, QAxBase, {ActiveQt Framework} */ @@ -632,8 +633,7 @@ void QAxScriptEngine::addItem(const QString &name) error() signal. Direct access to the QAxScriptEngine is provided through the scriptEngine() function. - \warning This class is not available with the bcc5.5 and MingW - compilers. + \warning This class is not available with the bcc5.5 compiler. \sa QAxScriptEngine, QAxScriptManager, QAxBase, {ActiveQt Framework} */ @@ -901,8 +901,7 @@ QAxBase *QAxScript::findObject(const QString &name) using addObject(). Then load() the script sources and invoke the functions using call(). - \warning This class is not available with the bcc5.5 and MingW - compilers. + \warning This class is not available with the bcc5.5 compiler. \sa QAxScript, QAxScriptEngine, QAxBase, {ActiveQt Framework} */ |