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 | |
| 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')
| -rw-r--r-- | src/testlib/qtest.h | 3 | ||||
| -rw-r--r-- | src/testlib/qtest_gui.h | 3 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 1 | ||||
| -rw-r--r-- | src/testlib/qtestcase.qdoc | 1 |
4 files changed, 8 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()) { diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 2faf37f32b..5027aea732 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -74,6 +74,9 @@ QT_BEGIN_NAMESPACE namespace QTest { +/*! + \internal + */ template<> inline char *toString(const QColor &color) { return qstrdup(color.name().toLocal8Bit().constData()); diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 385e456923..ed26c406a5 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -121,6 +121,7 @@ static void stackTrace() char cmd[512]; qsnprintf(cmd, 512, "gdb --pid %d 2>/dev/null <<EOF\n" "set prompt\n" + "set height 0\n" "thread apply all where full\n" "detach\n" "quit\n" diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index e2fc6e107f..9513cf0c58 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -528,6 +528,7 @@ \value Press The key is pressed. \value Release The key is released. \value Click The key is clicked (pressed and released). + \value Shortcut A shortcut is activated. This value has been added in Qt 5.6. */ /*! \enum QTest::MouseAction |