[Qt] Define MODULE_VERSION

https://bugs.webkit.org/show_bug.cgi?id=112808

Reviewed by Allan Sandfeld Jensen.

Upstream http://codereview.qt-project.org/49052
Use 5.2.0 as this is the next release that will be branched from trunk.

* .qmake.conf:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146363 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.qmake.conf b/.qmake.conf
index 646dc0ce0bb661e6034498fb2647b53930672a83..2763cbb58d6c6092384c9aec5a93e882014fb0d6 100644 (file)
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,3 +2,5 @@
 MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake)
 QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR
 load(qt_build_config)
+
+MODULE_VERSION = 5.2.0

diff --git a/ChangeLog b/ChangeLog
index b6c71fef42e989de84e086c1c38ceb9b5aa5365f..2580178987e3461bf4a70c6c99b22dc18bcb5324 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-20  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [Qt] Define MODULE_VERSION
+        https://bugs.webkit.org/show_bug.cgi?id=112808
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Upstream http://codereview.qt-project.org/49052
+        Use 5.2.0 as this is the next release that will be branched from trunk.
+
+        * .qmake.conf:
+
 2013-03-20  Rouslan Solomakhin  <rouslan@chromium.org>
 
         Copy-paste should not spellcheck when continuous spellcheck is turned off