diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-07-28 19:05:01 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2010-07-28 19:05:01 (GMT) |
| commit | f0e47672cc3f910aebd1d30fe3db21e9dbd943c4 (patch) | |
| tree | aa81c2bd3e6109417a6bd30d6a58111d892f25f2 /qtools/qstring.cpp | |
| parent | d0412f05557d55f465407a9337553c0a6ee0396f (diff) | |
| download | Doxygen-f0e47672cc3f910aebd1d30fe3db21e9dbd943c4.zip Doxygen-f0e47672cc3f910aebd1d30fe3db21e9dbd943c4.tar.gz Doxygen-f0e47672cc3f910aebd1d30fe3db21e9dbd943c4.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; |