diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-07 09:33:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-07 12:57:38 +0200 |
| commit | 864f930ba9e78dc2239d62bcf4038aead5e0490a (patch) | |
| tree | 95e81e8f551564ea6a4a1008be0bef6e5862b786 /src/corelib | |
| parent | f60bf8a18a09b6e81ae755918e0d98a7f3301070 (diff) | |
Fix MSVC warnings about inconsistent DLL linkage.
Change-Id: I42f817caf212b871cd00f976054381487b238d31
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 69650f50ef..ebf157a600 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -372,7 +372,7 @@ inline char qToLower(char ch) /*! \internal */ -bool qStringComparisonHelper(const QString &s1, const char *s2) +Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2) { // ### optimize me return s1 == QString::fromAscii(s2); @@ -381,7 +381,7 @@ bool qStringComparisonHelper(const QString &s1, const char *s2) /*! \internal */ -bool qStringComparisonHelper(const QString &s1, const QByteArray &s2) +Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray &s2) { // ### optimize me return s1 == QString::fromAscii(s2); @@ -390,7 +390,7 @@ bool qStringComparisonHelper(const QString &s1, const QByteArray &s2) /*! \internal */ -bool qStringComparisonHelper(const QStringRef &s1, const char *s2) +Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2) { // ### optimize me return s1 == QString::fromAscii(s2); @@ -399,7 +399,7 @@ bool qStringComparisonHelper(const QStringRef &s1, const char *s2) /*! \internal */ -bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2) +Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2) { // ### optimize me return s1 == QString::fromAscii(s2); diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 1ddaded7b3..4e59b0f30c 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -674,10 +674,10 @@ private: friend class QTextCodec; friend class QStringRef; friend struct QAbstractConcatenable; - friend bool qStringComparisonHelper(const QString &s1, const char *s2); - friend bool qStringComparisonHelper(const QString &s1, const QByteArray &s2); - friend bool qStringComparisonHelper(const QStringRef &s1, const char *s2); - friend bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2); + friend Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2); + friend Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray &s2); + friend Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2); + friend Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2); public: typedef Data * DataPtr; inline DataPtr &data_ptr() { return d; } |