diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/testlib | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.h | 3 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 1bfefaf2b0..8529791be4 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -47,6 +47,7 @@ #include <QtCore/qstring.h> #include <QtCore/qnamespace.h> #include <QtCore/qmetatype.h> +#include <QtCore/qtypetraits.h> #include <string.h> @@ -218,6 +219,8 @@ namespace QTest template <typename T> inline void addColumn(const char *name, T * = 0) { + typedef QtPrivate::is_same<T, const char*> QIsSameTConstChar; + Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format."); addColumnInternal(qMetaTypeId<T>(), name); } Q_TESTLIB_EXPORT QTestData &newRow(const char *dataTag); diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index c14f6e0687..06d7612185 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtTest QT = core-private CONFIG += exceptions |