diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-02 15:58:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 17:14:02 +0200 |
| commit | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (patch) | |
| tree | 928c856678a43b16a7cbc1f102f574156e7f8ffb /tests | |
| parent | b29fae1736ed306f10629bbd8b3363a23afbfb0f (diff) | |
Fix QString/QByteArray literals for MSVC2010 (compilation of tests).
- Specify return type of QByteArrayLiteral/QStringLiteral lambdas.
- Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER.
Change-Id: I8a53506887d2736b093798220b088f645f05e415
Reviewed-on: http://codereview.qt.nokia.com/2514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qstring/tst_qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 8c725fa109..f7a725c164 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -5110,7 +5110,7 @@ void tst_QString::toUpperLower_icu() void tst_QString::literals() { -#if defined(QT_QSTRING_UNICODE_MARKER) && (defined(Q_COMPILER_LAMBDA) || defined(Q_CC_GNU)) +#if defined(QT_UNICODE_LITERAL) && (defined(Q_COMPILER_LAMBDA) || defined(Q_CC_GNU)) QString str(QStringLiteral("abcd")); QVERIFY(str.length() == 4); |