summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjutaipal <juhani.taipale@digia.com>2012-10-05 05:58:21 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-08 21:23:53 +0200
commitceddcb631348f3b150f6e1882fa1a265c503c6df (patch)
treef420889eeb8b53e33f803f27aef5c94dc056ffc7 /src
parentd408593c1acbdde72b03e6a99816451224d7839d (diff)
Changed Qt release version to 4.8.4
Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.h4
-rw-r--r--src/plugins/qpluginbase.pri2
-rw-r--r--src/qbase.pri2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7f4165f41e..8346e46bbe 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.3"
+#define QT_VERSION_STR "4.8.4"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define QT_VERSION 0x040803
+#define QT_VERSION 0x040804
/*
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 ddead4b9c7..51986be4e3 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -1,6 +1,6 @@
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
- VERSION=4.8.3
+ VERSION=4.8.4
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}
diff --git a/src/qbase.pri b/src/qbase.pri
index 72a1825a57..283fc23330 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.3
+ VERSION=4.8.4
} else {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}