summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
committeraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
commit3c20b3ed8e89e351f1fb459e6ff5439f30958141 (patch)
tree2cae81c1eaa9f38de997a09aca5340978734ee07 /src/3rdparty
parent25a30c8e258df642a1aa2ffcfb162633611e7259 (diff)
parentc0cd8db0498daaa8151d1f80143b6849016bdc7c (diff)
downloadQt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.zip
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.gz
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.bz2
Merge remote branch 'qt-mainline/master'
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
index b98617f..07754a7 100644
--- a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
+++ b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri
@@ -1,5 +1,5 @@
-QT_WEBKIT_VERSION = 4.7.2
+QT_WEBKIT_VERSION = 4.7.3
QT_WEBKIT_MAJOR_VERSION = 4
QT_WEBKIT_MINOR_VERSION = 7
-QT_WEBKIT_PATCH_VERSION = 2
+QT_WEBKIT_PATCH_VERSION = 3
QT_CONFIG += webkit