diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
| commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
| tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /tests/auto/corelib/codecs/utf8/tst_utf8.cpp | |
| parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
| parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'tests/auto/corelib/codecs/utf8/tst_utf8.cpp')
| -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()); } |