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>
This commit is contained in:
parent
4fc1a10075
commit
adf1b30934
@ -40,7 +40,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <QtCore/qversionnumber.h>
|
#include <QtCore/private/qversionnumber_p.h>
|
||||||
#include <QtCore/qhash.h>
|
#include <QtCore/qhash.h>
|
||||||
#include <QtCore/private/qlocale_tools_p.h>
|
#include <QtCore/private/qlocale_tools_p.h>
|
||||||
#include <QtCore/qcollator.h>
|
#include <QtCore/qcollator.h>
|
||||||
@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
/*!
|
/*!
|
||||||
\class QVersionNumber
|
\class QVersionNumber
|
||||||
\inmodule QtCore
|
\inmodule QtCore
|
||||||
|
\internal
|
||||||
\since 5.4
|
\since 5.4
|
||||||
\brief The QVersionNumber class contains a version number with an arbitrary
|
\brief The QVersionNumber class contains a version number with an arbitrary
|
||||||
number of segments.
|
number of segments.
|
||||||
|
@ -46,7 +46,6 @@
|
|||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
#include <QtCore/qvariant.h>
|
#include <QtCore/qvariant.h>
|
||||||
#include <QtCore/qurl.h>
|
#include <QtCore/qurl.h>
|
||||||
#include <QtCore/qversionnumber.h>
|
|
||||||
|
|
||||||
#include <QtCore/qpoint.h>
|
#include <QtCore/qpoint.h>
|
||||||
#include <QtCore/qsize.h>
|
#include <QtCore/qsize.h>
|
||||||
@ -164,11 +163,6 @@ template<> inline char *toString(const QVariant &v)
|
|||||||
return qstrdup(vstring.constData());
|
return qstrdup(vstring.constData());
|
||||||
}
|
}
|
||||||
|
|
||||||
template<> inline char *toString(const QVersionNumber &version)
|
|
||||||
{
|
|
||||||
return toString(version.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
inline bool qCompare(QString const &t1, QLatin1String const &t2, const char *actual,
|
inline bool qCompare(QString const &t1, QLatin1String const &t2, const char *actual,
|
||||||
const char *expected, const char *file, int line)
|
const char *expected, const char *file, int line)
|
||||||
|
@ -1027,13 +1027,6 @@ QT_BEGIN_NAMESPACE
|
|||||||
Returns a textual representation of the given \a variant.
|
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)
|
/*! \fn void QTest::qWait(int ms)
|
||||||
|
|
||||||
Waits for \a ms milliseconds. While waiting, events will be processed and
|
Waits for \a ms milliseconds. While waiting, events will be processed and
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CONFIG += testcase parallel_test
|
CONFIG += testcase parallel_test
|
||||||
TARGET = tst_qversionnumber
|
TARGET = tst_qversionnumber
|
||||||
QT = core testlib
|
QT = core-private testlib
|
||||||
SOURCES = tst_qversionnumber.cpp
|
SOURCES = tst_qversionnumber.cpp
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <QtTest/QtTest>
|
#include <QtTest/QtTest>
|
||||||
#include <qversionnumber.h>
|
#include <private/qversionnumber_p.h>
|
||||||
|
|
||||||
class tst_QVersionNumber : public QObject
|
class tst_QVersionNumber : public QObject
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user