diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-03 13:04:22 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 04:47:12 +0100 |
| commit | 125bb81bef7729d182f533989ffdf53685abbe31 (patch) | |
| tree | 2965b845c1f3b320efcbb50cc35c3721347bcf2a | |
| parent | 8cbe52d5811a985e610aa76c3a17a75cd785fb19 (diff) | |
Fix compilation after b0afad8f0b6a3be7ab3a23e063b0201cd68ada95
That commit made QString::toXxx (8-bit) functions use C++11 ref
qualifiers, so we need to match it here.
Change-Id: I45b50464d36f858d012b12e0cb511aae347ddb6f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| -rw-r--r-- | tests/auto/corelib/codecs/utf8/tst_utf8.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp index e18f6f73b9..b00fd0dfd4 100644 --- a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp +++ b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp @@ -53,7 +53,11 @@ public: // test data: QTextCodec *codec; QString (*from8BitPtr)(const char *, int); +#ifdef Q_COMPILER_REF_QUALIFIERS + QByteArray (QString:: *to8Bit)() const &; +#else QByteArray (QString:: *to8Bit)() const; +#endif inline QString from8Bit(const QByteArray &ba) { return from8BitPtr(ba.constData(), ba.length()); } |