Make some qtestlib headers private.

These headers should have been private from Day One.  Make them private
now so that nobody will be tempted to use them outside testlib in the
future.

Change-Id: I5361777ade124d8187176f9af3cc79cd1a8ecb4f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

13 files changed, 92 insertions, 35 deletions

diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index e2f253c22e..0d115b0b3e 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qabstracttestlogger_p.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/private/qabstracttestlogger_p.h>
+#include <QtTest/qtestassert.h>
 
-#include "QtCore/qbytearray.h"
+#include <QtCore/qbytearray.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h
index 2abebe1251..a3e885b56a 100644
--- a/src/testlib/qbenchmarkmetric_p.h
+++ b/src/testlib/qbenchmarkmetric_p.h
@@ -42,6 +42,17 @@
 #ifndef QBENCHMARKMETRIC_P_H
 #define QBENCHMARKMETRIC_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtTest/qtest_global.h>
 #include <QtTest/qbenchmarkmetric.h>
 
diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement_p.h
index 1d06c8d8cd..17e6ede4b6 100644
--- a/src/testlib/qtestcoreelement.h
+++ b/src/testlib/qtestcoreelement_p.h
@@ -39,11 +39,22 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTCOREELEMENT_H
-#define QTESTCOREELEMENT_H
-
-#include <QtTest/qtestcorelist.h>
-#include <QtTest/qtestelementattribute.h>
+#ifndef QTESTCOREELEMENT_P_H
+#define QTESTCOREELEMENT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtTest/private/qtestcorelist_p.h>
+#include <QtTest/private/qtestelementattribute_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/testlib/qtestcorelist.h b/src/testlib/qtestcorelist_p.h
index 5027e4fcf9..263df17172 100644
--- a/src/testlib/qtestcorelist.h
+++ b/src/testlib/qtestcorelist_p.h
@@ -39,8 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTCORELIST_H
-#define QTESTCORELIST_H
+#ifndef QTESTCORELIST_P_H
+#define QTESTCORELIST_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qglobal.h>
 
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index 5f10947010..d0af966e8c 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/qtestelement.h>
+#include <QtTest/private/qtestelement_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qtestelement.h b/src/testlib/qtestelement_p.h
index aa048b07a0..583ef1cfea 100644
--- a/src/testlib/qtestelement.h
+++ b/src/testlib/qtestelement_p.h
@@ -39,10 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTELEMENT_H
-#define QTESTELEMENT_H
+#ifndef QTESTELEMENT_P_H
+#define QTESTELEMENT_P_H
 
-#include <QtTest/qtestcoreelement.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtTest/private/qtestcoreelement_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index dda40b13fc..1ab25af25b 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/qtestelementattribute.h>
+#include <QtTest/private/qtestelementattribute_p.h>
 #include <QtCore/qbytearray.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/testlib/qtestelementattribute.h b/src/testlib/qtestelementattribute_p.h
index 3e146a550a..9993321e81 100644
--- a/src/testlib/qtestelementattribute.h
+++ b/src/testlib/qtestelementattribute_p.h
@@ -39,10 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTELEMENTATTRIBUTE_H
-#define QTESTELEMENTATTRIBUTE_H
+#ifndef QTESTELEMENTATTRIBUTE_P_H
+#define QTESTELEMENTATTRIBUTE_P_H
 
-#include <QtTest/qtestcorelist.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtTest/private/qtestcorelist_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index b4ff109b00..2c0b074cd8 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/private/qtestxunitstreamer_p.h>
 #include <QtTest/private/qxunittestlogger_p.h>
-#include <QtTest/qtestelement.h>
-#include <QtTest/qtestelementattribute.h>
+#include <QtTest/private/qtestelement_p.h>
+#include <QtTest/private/qtestelementattribute_p.h>
 #include <QtTest/qtestassert.h>
 #include <QtTest/private/qtestlog_p.h>
 #include <QtTest/private/qtestresult_p.h>
diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer_p.h
index 127c9b1780..825890258a 100644
--- a/src/testlib/qtestxunitstreamer.h
+++ b/src/testlib/qtestxunitstreamer_p.h
@@ -39,8 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QTESTXUNITSTREAMER_H
-#define QTESTXUNITSTREAMER_H
+#ifndef QTESTXUNITSTREAMER_P_H
+#define QTESTXUNITSTREAMER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/qglobal.h>
 
diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qxunittestlogger.cpp
index 56ae43b311..97a02eaff2 100644
--- a/src/testlib/qxunittestlogger.cpp
+++ b/src/testlib/qxunittestlogger.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <QtTest/private/qxunittestlogger_p.h>
-#include <QtTest/qtestelement.h>
-#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/private/qtestelement_p.h>
+#include <QtTest/private/qtestxunitstreamer_p.h>
 #include <QtTest/qtestcase.h>
 #include <QtTest/private/qtestresult_p.h>
 #include <QtTest/private/qbenchmark_p.h>
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index d4dec9660e..183ad516de 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -19,11 +19,7 @@ HEADERS = qbenchmark.h \
     qtestaccessible.h \
     qtestassert.h \
     qtestcase.h \
-    qtestcoreelement.h \
-    qtestcorelist.h \
     qtestdata.h \
-    qtestelementattribute.h \
-    qtestelement.h \
     qtestevent.h \
     qtesteventloop.h \
     qtest_global.h \
@@ -34,7 +30,7 @@ HEADERS = qbenchmark.h \
     qtestspontaneevent.h \
     qtestsystem.h \
     qtesttouch.h \
-    qtestxunitstreamer.h
+
 SOURCES = qtestcase.cpp \
     qtestlog.cpp \
     qtesttable.cpp \
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 6f07ad7d1e..565332049c 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -514,11 +514,7 @@ QT_CLASS_LIB(QTest, QtTest, qtest.h)
 QT_CLASS_LIB(QtTestGui, QtTest, qtest_gui.h)
 QT_CLASS_LIB(QTestAccessibilityEvent, QtTest, qtestaccessible.h)
 QT_CLASS_LIB(QTestAccessibility, QtTest, qtestaccessible.h)
-QT_CLASS_LIB(QTestCoreElement, QtTest, qtestcoreelement.h)
-QT_CLASS_LIB(QTestCoreList, QtTest, qtestcorelist.h)
 QT_CLASS_LIB(QTestData, QtTest, qtestdata.h)
-QT_CLASS_LIB(QTestElement, QtTest, qtestelement.h)
-QT_CLASS_LIB(QTestElementAttribute, QtTest, qtestelementattribute.h)
 QT_CLASS_LIB(QTestEvent, QtTest, qtestevent.h)
 QT_CLASS_LIB(QTestKeyEvent, QtTest, qtestevent.h)
 QT_CLASS_LIB(QTestKeyClicksEvent, QtTest, qtestevent.h)
@@ -529,7 +525,6 @@ QT_CLASS_LIB(QTestEventLoop, QtTest, qtesteventloop.h)
 QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h)
 QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h)
 QT_CLASS_LIB(QSpontaneKeyEvent, QtTest, qtestspontaneevent.h)
-QT_CLASS_LIB(QTestXunitStreamer, QtTest, qtestxunitstreamer.h)
 QT_CLASS_LIB(QDBusAbstractAdaptor, QtDBus, qdbusabstractadaptor.h)
 QT_CLASS_LIB(QDBusAbstractInterfaceBase, QtDBus, qdbusabstractinterface.h)
 QT_CLASS_LIB(QDBusAbstractInterface, QtDBus, qdbusabstractinterface.h)