summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2010-04-15 14:38:02 (GMT)
committerIain <qt-info@nokia.com>2010-04-16 21:07:57 (GMT)
commit8f1b5bc690e3e3ddc9c23b358ef0b34f259361f7 (patch)
treeba89f7ab03bd92a1f72a8fcfb8e7f1679c09030a
parent36d43043b0a82620de58db7105152f087f99d535 (diff)
downloadQt-8f1b5bc690e3e3ddc9c23b358ef0b34f259361f7.zip
Qt-8f1b5bc690e3e3ddc9c23b358ef0b34f259361f7.tar.gz
Qt-8f1b5bc690e3e3ddc9c23b358ef0b34f259361f7.tar.bz2
Symbol visibility fixes for RVCT4 on Symbian
RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and other Qt modules are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron (cherry picked from commit b2271d364cdc26187e5f9113f4c1816f334e37a1)
-rw-r--r--src/script/api/qscriptengine.cpp2
-rw-r--r--src/script/parser/qscriptlexer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 58c8d83..54615d5 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2006,7 +2006,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
#ifndef QT_NO_REGEXP
-extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
+Q_DECL_IMPORT extern 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 38ad6ce..ca64776 100644
--- a/src/script/parser/qscriptlexer.cpp
+++ b/src/script/parser/qscriptlexer.cpp
@@ -31,7 +31,7 @@
QT_BEGIN_NAMESPACE
-extern double qstrtod(const char *s00, char const **se, bool *ok);
+Q_DECL_IMPORT extern double qstrtod(const char *s00, char const **se, bool *ok);
#define shiftWindowsLineBreak() \
do { \