From a2ae9120895f3da3915501c371a24b86ae2a3002 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 24 Jan 2013 12:47:04 +0100 Subject: Fixed Qt version in qmlobserver QT_VERSION_STR is being read from Qt's source directory and may differ from the version of the build being used See also printVersion() in src/app/main.cpp Change-Id: Ib740c07136e1549b0cbecc8258889688763b0b36 Reviewed-by: Thomas Hartmann --- share/qtcreator/qml/qmlobserver/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp index 0f9e975522..eb0f55a203 100644 --- a/share/qtcreator/qml/qmlobserver/main.cpp +++ b/share/qtcreator/qml/qmlobserver/main.cpp @@ -368,7 +368,7 @@ static void parseCommandLineOptions(const QStringList &arguments) if (lastArg) usage(); qApp->setStartDragDistance(arguments.at(++i).toInt()); } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) { - qWarning("Qt QML Viewer version %s", QT_VERSION_STR); + qWarning("Qt QML Viewer version %s", qVersion()); exitApp(0); } else if (arg == "-translation") { if (lastArg) usage(); -- cgit v1.2.3