diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-10 18:19:45 -0800 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-13 20:04:44 +0100 |
| commit | adf1b30934f2b2b92271955e7867a7b2620bc6b9 (patch) | |
| tree | fc213baccc3a4e9a1589b29debb147e520455583 /src | |
| parent | 4fc1a100756ee86d96a320490ce747224ba9726a (diff) | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qversionnumber.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/tools/qversionnumber_p.h (renamed from src/corelib/tools/qversionnumber.h) | 0 | ||||
| -rw-r--r-- | src/testlib/qtest.h | 6 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 7 |
4 files changed, 2 insertions, 14 deletions
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 4d148249c0..3c8a9db086 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 index a951b2f1a0..a951b2f1a0 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber_p.h diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index d3443e7390..6298262958 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 2d92b3f6bd..b174913eae 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 |