summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2010-04-16 19:31:38 (GMT)
committerIain <qt-info@nokia.com>2010-04-16 21:07:59 (GMT)
commitb5eeb8a5facc34e66a34ba317d2ed63b6d1be4af (patch)
tree159d945b700762135f2a840b10452ad9721b5d0c
parent26b6822674d1f96c4fdc9cb2078e7212372fa9ff (diff)
downloadQt-b5eeb8a5facc34e66a34ba317d2ed63b6d1be4af.zip
Qt-b5eeb8a5facc34e66a34ba317d2ed63b6d1be4af.tar.gz
Qt-b5eeb8a5facc34e66a34ba317d2ed63b6d1be4af.tar.bz2
Further RVCT4 fixes for Symbian
More corrections to declarations to ensure symbol visibility is correct Task-number: QTBUG-9998 Reviewed-by: TrustMe
-rw-r--r--src/declarative/qml/parser/qdeclarativejslexer.cpp2
-rw-r--r--src/gui/text/qstatictext.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index a616146..3a0e897 100644
--- a/src/declarative/qml/parser/qdeclarativejslexer.cpp
+++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp
@@ -57,7 +57,7 @@
#include <string.h>
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);
QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 06b0d3b..d7bf34e 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -387,8 +387,8 @@ QStaticTextPrivate *QStaticTextPrivate::get(const QStaticText *q)
return q->data.data();
}
-extern int qt_defaultDpiX();
-extern int qt_defaultDpiY();
+Q_GUI_EXPORT extern int qt_defaultDpiX();
+Q_GUI_EXPORT extern int qt_defaultDpiY();
namespace {