aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2013-01-24 12:47:04 +0100
committerRobert Loehning <robert.loehning@digia.com>2013-01-28 12:22:10 +0100
commita2ae9120895f3da3915501c371a24b86ae2a3002 (patch)
tree060e8ab7b3398af919a7fb6ca4e2c74c6d4a3290
parentfd43bdd563021c44ec53eb40c9dcc19f5a01b1b0 (diff)
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 <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qml/qmlobserver/main.cpp2
1 files changed, 1 insertions, 1 deletions
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();