1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QLibraryInfo::version() returning the Qt version as QVersionNumber

Browse Source 
[ChangeLog][QtCore][QLibraryInfo] Added QLibraryInfo::version(), which
returns the current version of the Qt library as a QVersionNumber
object.

Change-Id: Ifea6e497f11a461db432ffff1448d4dc84ef57b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2016-04-25 23:28:42 -07:00
parent f05d5dfa85
commit 6dfc3541e6
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qglobal.cpp
View File

@ -1033,7 +1033,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in
example, "4.1.2"). This may be a different version than the
version the application was compiled against.
\sa QT_VERSION_STR
\sa QT_VERSION_STR, QLibraryInfo::version()
*/
const char *qVersion() Q_DECL_NOTHROW

13
src/corelib/global/qlibraryinfo.cpp
View File

@ -366,6 +366,19 @@ QLibraryInfo::isDebugBuild()
#endif
}
#ifndef QT_BOOTSTRAPPED
/*!
\since 5.8
Returns the version of the Qt library.
\sa qVersion()
*/
QVersionNumber QLibraryInfo::version() Q_DECL_NOTHROW
{
return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH);
}
#endif // QT_BOOTSTRAPPED
#endif // QT_BUILD_QMAKE
/*

5
src/corelib/global/qlibraryinfo.h
View File

@ -42,6 +42,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qversionnumber.h>
QT_BEGIN_NAMESPACE
@ -63,6 +64,10 @@ public:
static bool isDebugBuild();
#ifndef QT_BOOTSTRAPPED
static QVersionNumber version() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION;
#endif
enum LibraryLocation
{
PrefixPath = 0,

13
tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
View File

@ -29,6 +29,7 @@
#include <QtTest/QtTest>
#include <QtCore/qversionnumber.h>
#include <QtCore/qlibraryinfo.h>
class tst_QVersionNumber : public QObject
{
@ -79,6 +80,7 @@ private slots:
void serialize_data();
void serialize();
void moveSemantics();
void qtVersion();
};
void tst_QVersionNumber::singleInstanceData()
@ -636,6 +638,17 @@ void tst_QVersionNumber::moveSemantics()
#endif
}
void tst_QVersionNumber::qtVersion()
{
QVersionNumber v = QLibraryInfo::version();
QVERIFY(!v.isNull());
QCOMPARE(v.majorVersion(), QT_VERSION_MAJOR);
// we can't compare the minor and micro version:
// the library may change without the test being recompiled
QCOMPARE(v.toString(), QString(qVersion()));
}
QTEST_APPLESS_MAIN(tst_QVersionNumber)
#include "tst_qversionnumber.moc"