diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 13:46:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 13:46:28 (GMT) |
| commit | 99fede9d683b312fa79f45aa60c38bcb143c38fd (patch) | |
| tree | 9a44eb984a8513270f23250f8d7750bdd9797266 /src/declarative/qml/parser/qdeclarativejslexer.cpp | |
| parent | fd36b47e8758562fc9ff350f292fc9ae9ed91d4e (diff) | |
| parent | daaaea2d79f37c7fa22eef174d6489939e965a8e (diff) | |
| download | Qt-99fede9d683b312fa79f45aa60c38bcb143c38fd.zip Qt-99fede9d683b312fa79f45aa60c38bcb143c38fd.tar.gz Qt-99fede9d683b312fa79f45aa60c38bcb143c38fd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
EABI and BWINS DEF file updates for Symbian
Further RVCT4 fixes for Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Fixed automatic patching of self-signed packages
Webkit got bigger, make it link again on armlink
Set library path properly for all systems
Make debugging floating point mistakes much easier.
Simplify docs a bit
Fix check for arm based systems
Fix option(recursive)
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejslexer.cpp')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer.cpp | 2 |
1 files changed, 1 insertions, 1 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 |