diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
| commit | 6357813207c866c99aadfd91af8fb3affe891f1d (patch) | |
| tree | 69464d415b12ebaa3e57d88d7b5cd113878be988 /src/testlib/qtest.h | |
| parent | 5a76a3fb03f8d1dc8cb367de1a1dc6a37048376a (diff) | |
| parent | b3fcaea5f2b97d3f562add97aee48cbb469c875a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
src/3rdparty/double-conversion/include/double-conversion/utils.h
src/corelib/global/qnamespace.qdoc
src/corelib/tools/qsimd_p.h
tests/auto/corelib/io/qfile/tst_qfile.cpp
Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34
Diffstat (limited to 'src/testlib/qtest.h')
| -rw-r--r-- | src/testlib/qtest.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 7352e89016..261c769c15 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -173,6 +173,9 @@ template<> inline char *toString(const QVariant &v) } #ifdef QT_NETWORK_LIB +/*! + \internal + */ template<> inline char *toString(const QHostAddress &addr) { switch (addr.protocol()) { |