summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-06-07 15:57:56 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-06-07 16:18:22 (GMT)
commitbbf78c9b422c4c7eda7e7fce067578c75d3bc9b3 (patch)
tree2ddd960cecc78c60620faae4443d8c30eccc1428 /src/declarative
parent679611c26c5b7ecf63b4ed490803073a96ce9d92 (diff)
downloadQt-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/declarative')
-rw-r--r--src/declarative/qml/parser/qdeclarativejslexer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp
index 975ad4c..fcaaece 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
-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);
QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE