diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-06-11 12:21:15 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-06-11 14:49:12 (GMT) |
| commit | e311bd0b23cf8696f284b8da3dcc5a591c7b689e (patch) | |
| tree | e9bcddf734f63acf04b2387d665d856764592a07 /src/script | |
| parent | 6f5f6e1455162a890ff9ae0adaeab38216b7f103 (diff) | |
| download | Qt-e311bd0b23cf8696f284b8da3dcc5a591c7b689e.zip Qt-e311bd0b23cf8696f284b8da3dcc5a591c7b689e.tar.gz Qt-e311bd0b23cf8696f284b8da3dcc5a591c7b689e.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')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 | ||||
| -rw-r--r-- | src/script/parser/qscriptlexer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index f44f33d..fe12fc8 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1603,7 +1603,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, #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); /*! Creates a QtScript object of class RegExp with the given diff --git a/src/script/parser/qscriptlexer.cpp b/src/script/parser/qscriptlexer.cpp index ca64776..3ddc3aa 100644 --- a/src/script/parser/qscriptlexer.cpp +++ b/src/script/parser/qscriptlexer.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE -Q_DECL_IMPORT extern double qstrtod(const char *s00, char const **se, bool *ok); +Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); #define shiftWindowsLineBreak() \ do { \ |