diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-08-30 13:56:37 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-08-30 13:56:37 (GMT) |
| commit | 86870a0592554416d82c6a34abce1c6748d5d69c (patch) | |
| tree | dbfbc48e46473514469da2051397c90524449831 | |
| parent | f099e3556ae00eb389a3071f17f0eed8bfd5aa64 (diff) | |
| download | mxe-86870a0592554416d82c6a34abce1c6748d5d69c.zip mxe-86870a0592554416d82c6a34abce1c6748d5d69c.tar.gz mxe-86870a0592554416d82c6a34abce1c6748d5d69c.tar.bz2 | |
package qt: fix for using svg plugin
| -rw-r--r-- | src/qt-1-win32.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/qt-1-win32.patch b/src/qt-1-win32.patch index 990894d..6821951 100644 --- a/src/qt-1-win32.patch +++ b/src/qt-1-win32.patch @@ -1149,3 +1149,26 @@ index e6b9476..a0cff96 100755 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 + |