aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmleasing
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-02-24 10:14:57 +0100
committerLiang Qi <liang.qi@qt.io>2017-02-24 11:48:14 +0100
commitb1fa22c1683d9f6cedb001f5ef8a0dac71868935 (patch)
treec30a114c75be071310df974283b928329f9d5c12 /tools/qmleasing
parentba68c325688acf3072715757480497524f61c425 (diff)
parentfe5d69669197a51662061b014810f0242eec5ca7 (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts: src/qml/compiler/qv4ssa.cpp src/quick/accessible/qaccessiblequickview_p.h src/quick/items/qquickmousearea.cpp src/quick/util/qquickanimatorjob.cpp tools/qmlplugindump/main.cpp Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
Diffstat (limited to 'tools/qmleasing')
-rw-r--r--tools/qmleasing/qmleasing.pro9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro
index e334faa77a..534bc9fe98 100644
--- a/tools/qmleasing/qmleasing.pro
+++ b/tools/qmleasing/qmleasing.pro
@@ -17,4 +17,13 @@ FORMS += \
pane.ui \
import.ui
+QMAKE_TARGET_PRODUCT = qmleasing
+QMAKE_TARGET_DESCRIPTION = QML easing curve editor
+
+win32 {
+ VERSION = $${QT_VERSION}.0
+} else {
+ VERSION = $${QT_VERSION}
+}
+
load(qt_app)