diff options
| author | Akseli Salovaara <akseli.salovaara@digia.com> | 2014-12-01 13:27:34 (GMT) |
|---|---|---|
| committer | Simo Fält <simo.falt@theqtcompany.com> | 2014-12-03 09:16:51 (GMT) |
| commit | 9997a687f835926af0d96243caeba32e38761c28 (patch) | |
| tree | c533034578bdb3c55dc737773af35faa577ea48a /src | |
| parent | 020664da2db7086b81864a7f9658cf783b2ec83b (diff) | |
| download | Qt-9997a687f835926af0d96243caeba32e38761c28.zip Qt-9997a687f835926af0d96243caeba32e38761c28.tar.gz Qt-9997a687f835926af0d96243caeba32e38761c28.tar.bz2 | |
Bump Qt version to 4.8.7
Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
| -rw-r--r-- | src/plugins/qpluginbase.pri | 2 | ||||
| -rw-r--r-- | src/qbase.pri | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 40bca31..5e28aa6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -44,11 +44,11 @@ #include <stddef.h> -#define QT_VERSION_STR "4.8.6" +#define QT_VERSION_STR "4.8.7" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040806 +#define QT_VERSION 0x040807 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index eae7c6e..f4e95bd 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.8.6 + VERSION=4.8.7 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qbase.pri b/src/qbase.pri index 6792261..78bf01a 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.8.6 + VERSION=4.8.7 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |