From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Mon, 23 May 2011 14:11:59 +0000 (-0500)
Subject: Use qglobal.h's VERSION number instead of hardcoded current version
X-Git-Tag: qt-v5.0.0-alpha1~4270^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e79846298b7e80e713a75bd5f0f31b05270db5de;p=profile%2Fivi%2Fqtbase.git

Use qglobal.h's VERSION number instead of hardcoded current version

Done-by: Friedemann Kleint
---

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 5819077..c4dd47b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3647,7 +3647,7 @@ void Configure::buildQmake()
                     << "BUILD_PATH = " << QDir::convertSeparators(buildPath) << endl
                     << "SOURCE_PATH = " << QDir::convertSeparators(sourcePath) << endl;
                 stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl
-                       << "QT_VERSION = " << QT_VERSION_STR << endl;
+                       << "QT_VERSION = " << dictionary["VERSION"] << endl;
 
                 if (dictionary["EDITION"] == "OpenSource" ||
                     dictionary["QT_EDITION"].contains("OPENSOURCE"))