diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2010-07-28 19:05:01 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2010-07-28 19:05:01 (GMT) |
| commit | 4ad0d24c5b3a0afd99722ae5c33968ff9fa44e2d (patch) | |
| tree | aa81c2bd3e6109417a6bd30d6a58111d892f25f2 /qtools/qstring.cpp | |
| parent | c37c8626674dd6ba0d53dcad84dd4bb5d92005a4 (diff) | |
| download | Doxygen-4ad0d24c5b3a0afd99722ae5c33968ff9fa44e2d.zip Doxygen-4ad0d24c5b3a0afd99722ae5c33968ff9fa44e2d.tar.gz Doxygen-4ad0d24c5b3a0afd99722ae5c33968ff9fa44e2d.tar.bz2 | |
Release-1.7.1-20100728
Diffstat (limited to 'qtools/qstring.cpp')
| -rw-r--r-- | qtools/qstring.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index 5d50060..bc3dfc7 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -12170,13 +12170,20 @@ QString QString::fromUcs2( const unsigned short *str ) */ Q_EXPORT QStringData *QString::shared_null = 0; -QT_STATIC_CONST_IMPL QString QString::null; +//QT_STATIC_CONST_IMPL QString QString::null; QT_STATIC_CONST_IMPL QChar QChar::null; QT_STATIC_CONST_IMPL QChar QChar::replacement((ushort)0xfffd); QT_STATIC_CONST_IMPL QChar QChar::byteOrderMark((ushort)0xfeff); QT_STATIC_CONST_IMPL QChar QChar::byteOrderSwapped((ushort)0xfffe); QT_STATIC_CONST_IMPL QChar QChar::nbsp((ushort)0x00a0); +#if defined(_CC_MSVC_) && _MSC_VER <= 1300 +const QString::Null QString::null; +#else +const QString::Null QString::null = { }; +#endif + + QStringData* QString::makeSharedNull() { return shared_null=new QStringData; |