diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-06-07 15:57:56 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-06-07 16:18:22 (GMT) |
| commit | bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3 (patch) | |
| tree | 2ddd960cecc78c60620faae4443d8c30eccc1428 /src/script/api | |
| parent | 679611c26c5b7ecf63b4ed490803073a96ce9d92 (diff) | |
| download | Qt-bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3.zip Qt-bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3.tar.gz Qt-bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3.tar.bz2 | |
Allow to build Qt in static with mingw
Some functions were marked with Q_DECL_IMPORT where they should just be
Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in
case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport).
That leads the linker to try to import it and it shouldn't.
Task-number: QTBUG-10791
Reviewed-by: gabi
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 86915bb..f02ea52 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1525,7 +1525,7 @@ void QScriptEnginePrivate::detachAllRegisteredScriptStrings() #ifndef QT_NO_REGEXP -Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); +Q_CORE_EXPORT QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); JSC::JSValue QScriptEnginePrivate::newRegExp(JSC::ExecState *exec, const QRegExp ®exp) { @@ -2020,8 +2020,6 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, #ifndef QT_NO_REGEXP -Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); - /*! Creates a QtScript object of class RegExp with the given \a regexp. |