diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-01 23:19:06 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-01 23:19:06 (GMT) |
| commit | 825c7cf9d5d8e83074636c2feeefc15a3062781d (patch) | |
| tree | 58d031e1bcab47451e8aff7295ca2a93b0cae6dd /src | |
| parent | dff56298f86925fa31f0215f1782e7cdec318fac (diff) | |
| parent | d16ba0a93d611689bce9a2732a1cc8c9a317f5bf (diff) | |
| download | Qt-825c7cf9d5d8e83074636c2feeefc15a3062781d.zip Qt-825c7cf9d5d8e83074636c2feeefc15a3062781d.tar.gz Qt-825c7cf9d5d8e83074636c2feeefc15a3062781d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
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 2e9f839..6623e0c 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.6.0" +#define QT_VERSION_STR "4.6.1" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040600 +#define QT_VERSION 0x040601 /* 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 a3abc98..b66f8f9 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.0 + VERSION=4.6.1 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qbase.pri b/src/qbase.pri index 0aae24d..d1a2a75 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.6.0 + VERSION=4.6.1 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |