diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 01:30:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 02:59:14 +0200 |
| commit | 642ebccaad1656420fc5a9b37c04bec02ec079b4 (patch) | |
| tree | eaabf10380ca37ecb8899bd1e146153c642b223e /tests | |
| parent | 129a8ce3898091c7a6a84b9b0b68fa32b7ce61bd (diff) | |
| parent | 8c6755aeec312ae771ef334fc863642514db3f7c (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index aec8d1b241..290d4ac240 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -2467,7 +2467,7 @@ void tst_QSettings::testEscapes() QString s = QSettingsPrivate::variantToString(v); \ QCOMPARE(s, escStr); \ QCOMPARE(QVariant(QSettingsPrivate::stringToVariant(escStr)), v); \ - QVERIFY(val == v.func()); \ + QVERIFY((val) == v.func()); \ } #define testBadEscape(escStr, vStr) \ diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp index 05d5f94e3d..75b17df759 100644 --- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp +++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp @@ -56,10 +56,11 @@ #define STRINGPREP_BIDI_LEADTRAIL_NOT_RAL 5 struct ushortarray { - ushortarray(unsigned short *array = 0) + ushortarray() {} + template <size_t N> + ushortarray(unsigned short (&array)[N]) { - if (array) - memcpy(points, array, sizeof(points)); + memcpy(points, array, N*sizeof(unsigned short)); } unsigned short points[100]; |