From adf1b30934f2b2b92271955e7867a7b2620bc6b9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 10 Nov 2014 18:19:45 -0800
Subject: [PATCH] Make QVersionNumber private
We're not ready.
[ChangeLog][EDITORIAL] Remove all mentions of QVersionNumber.
Change-Id: I03ad95992982eb3177f982c1eeddb6a6bc29336c
Reviewed-by: Keith Gardner <kreios4004@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
src/corelib/tools/qversionnumber.cpp | 3 ++-
src/corelib/tools/{qversionnumber.h => qversionnumber_p.h} | 0
src/testlib/qtest.h | 6 ------
src/testlib/qtestcase.cpp | 7 -------
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro | 2 +-
.../corelib/tools/qversionnumber/tst_qversionnumber.cpp | 2 +-
6 files changed, 4 insertions(+), 16 deletions(-)
rename src/corelib/tools/{qversionnumber.h => qversionnumber_p.h} (100%)
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 4d148249c04..3c8a9db0862 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -40,7 +40,7 @@
**
****************************************************************************/
-#include <QtCore/qversionnumber.h>
+#include <QtCore/private/qversionnumber_p.h>
#include <QtCore/qhash.h>
#include <QtCore/private/qlocale_tools_p.h>
#include <QtCore/qcollator.h>
@@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QVersionNumber
\inmodule QtCore
+ \internal
\since 5.4
\brief The QVersionNumber class contains a version number with an arbitrary
number of segments.
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber_p.h
similarity index 100%
rename from src/corelib/tools/qversionnumber.h
rename to src/corelib/tools/qversionnumber_p.h
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index d3443e73909..62982629585 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -46,7 +46,6 @@
#include <QtCore/qobject.h>
#include <QtCore/qvariant.h>
#include <QtCore/qurl.h>
-#include <QtCore/qversionnumber.h>
#include <QtCore/qpoint.h>
#include <QtCore/qsize.h>
@@ -164,11 +163,6 @@ template<> inline char *toString(const QVariant &v)
return qstrdup(vstring.constData());
}
-template<> inline char *toString(const QVersionNumber &version)
-{
- return toString(version.toString());
-}
-
template<>
inline bool qCompare(QString const &t1, QLatin1String const &t2, const char *actual,
const char *expected, const char *file, int line)
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 2d92b3f6bdc..b174913eae7 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1027,13 +1027,6 @@ QT_BEGIN_NAMESPACE
Returns a textual representation of the given \a variant.
*/
-/*!
- \fn char *QTest::toString(const QVersionNumber &version)
- \overload
-
- Returns a textual representation of the given \a version.
-*/
-
/*! \fn void QTest::qWait(int ms)
Waits for \a ms milliseconds. While waiting, events will be processed and
diff --git a/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro b/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
index 08ee0dd3d99..1e74d42bbd8 100644
--- a/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
+++ b/tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
@@ -1,4 +1,4 @@
CONFIG += testcase parallel_test
TARGET = tst_qversionnumber
-QT = core testlib
+QT = core-private testlib
SOURCES = tst_qversionnumber.cpp
diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
index 18bc86620a1..f97b8a4df84 100644
--- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
+++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
@@ -33,7 +33,7 @@
****************************************************************************/
#include <QtTest/QtTest>
-#include <qversionnumber.h>
+#include <private/qversionnumber_p.h>
class tst_QVersionNumber : public QObject
{
--
GitLab