Use qglobal.h's VERSION number instead of hardcoded current version
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Mon, 23 May 2011 14:11:59 +0000 (09:11 -0500)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Mon, 23 May 2011 14:11:59 +0000 (09:11 -0500)
Done-by: Friedemann Kleint
tools/configure/configureapp.cpp

index 5819077..c4dd47b 100644 (file)
@@ -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"))