Mercurial > mxe-octave
changeset 1104:3cd158b49847
package qt: fix for using svg plugin
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 30 Aug 2010 15:56:37 +0200 |
| parents | e3a67857c3d7 |
| children | 8ff92ef0825f |
| files | src/qt-1-win32.patch |
| diffstat | 1 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt-1-win32.patch Mon Aug 30 13:09:25 2010 +0200 +++ b/src/qt-1-win32.patch Mon Aug 30 15:56:37 2010 +0200 @@ -1149,3 +1149,26 @@ QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" + +commit 7bdb22e090d0c74dafbd02f950b9c986c4cb4b2a +Author: Mark Brand <mabrand@mabrand.nl> +Date: Mon Aug 30 15:51:55 2010 +0200 + + fix import/export of symbol for static svg plugin + + Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for + static code. Changed to Q_CORE_IMPORT. + +diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp +index d545440..bf19a88 100644 +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE + static const char *qt_inherit_text = "inherit"; + #define QT_INHERIT QLatin1String(qt_inherit_text) + +-Q_DECL_IMPORT double qstrtod(const char *s00, char const **se, bool *ok); ++Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); + + // ======== duplicated from qcolor_p +