diff options
author | Keith Gardner <kreios4004@gmail.com> | 2015-07-08 20:57:51 -0500 |
---|---|---|
committer | Keith Gardner <kreios4004@gmail.com> | 2015-07-10 00:47:03 +0000 |
commit | 6094ae1ff5da7f6f317d0212f19c6304179e1ada (patch) | |
tree | 2b6a877f453959e4170c3b236832c7b12b387527 | |
parent | 8c7a9bfbbc8f65256c0ae9dcca2c6f765340d792 (diff) |
Added QVersionNumber to QtCore's public API
[ChangeLog][QtCore] Added QVersionNumber.
Change-Id: I11acc1fae3dc9368a72593afcfa2e462c53a620e
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Keith Gardner <kreios4004@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r-- | src/corelib/tools/qversionnumber.cpp | 3 | ||||
-rw-r--r-- | src/corelib/tools/qversionnumber.h (renamed from src/corelib/tools/qversionnumber_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/tools/tools.pri | 2 | ||||
-rw-r--r-- | src/gui/opengl/qopengl_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsopengltester.h | 2 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 660f40b107..ee30124eb5 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -32,7 +32,7 @@ ** ****************************************************************************/ -#include <QtCore/private/qversionnumber_p.h> +#include <QtCore/qversionnumber.h> #include <QtCore/qhash.h> #include <QtCore/private/qlocale_tools_p.h> #include <QtCore/qcollator.h> @@ -53,7 +53,6 @@ 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_p.h b/src/corelib/tools/qversionnumber.h index 2da3103be3..2da3103be3 100644 --- a/src/corelib/tools/qversionnumber_p.h +++ b/src/corelib/tools/qversionnumber.h diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 60b53a3d8a..c43fd761d8 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -75,7 +75,7 @@ HEADERS += \ tools/qunicodetools_p.h \ tools/qvarlengtharray.h \ tools/qvector.h \ - tools/qversionnumber_p.h + tools/qversionnumber.h SOURCES += \ diff --git a/src/gui/opengl/qopengl_p.h b/src/gui/opengl/qopengl_p.h index 31a083d96f..6b66a3ba57 100644 --- a/src/gui/opengl/qopengl_p.h +++ b/src/gui/opengl/qopengl_p.h @@ -49,7 +49,7 @@ #include <private/qopenglcontext_p.h> #include <QtCore/qset.h> #include <QtCore/qstring.h> -#include <private/qversionnumber_p.h> +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h index 748885542d..3cd8bf4d4b 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.h +++ b/src/plugins/platforms/windows/qwindowsopengltester.h @@ -36,7 +36,7 @@ #include <QtCore/QByteArray> #include <QtCore/QFlags> -#include <private/qversionnumber_p.h> +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp index 4202b87b2d..0b8b63a1e8 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 <private/qversionnumber_p.h> +#include <QtCore/qversionnumber.h> class tst_QVersionNumber : public QObject { |