aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-07-26 14:32:39 +0200
committerKai Koehne <kai.koehne@qt.io>2017-07-28 10:41:43 +0000
commit11a664a75275d0c21d02bf550304f981182f19e8 (patch)
tree4ca4ed04ecd963b5a90edf7d83f8d1971ebf2466 /tools
parentce5436a9a07b5593529afc0a259e55d5c716e41c (diff)
Remove custom setting of qmake VERSION field in tools
qt_tool.prf sets the VERSION to MODULE_VERSION by default. Also, qmake automatically makes it a quadruple for the .rc file metadata. Change-Id: Ie2d0f2022c4416ce824a6786eef4a8c461ed70f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qml.pro6
-rw-r--r--tools/qmleasing/qmleasing.pro6
-rw-r--r--tools/qmlimportscanner/qmlimportscanner.pro6
-rw-r--r--tools/qmljs/qmljs.pro6
-rw-r--r--tools/qmllint/qmllint.pro6
-rw-r--r--tools/qmlmin/qmlmin.pro6
-rw-r--r--tools/qmlplugindump/qmlplugindump.pro6
-rw-r--r--tools/qmlprofiler/qmlprofiler.pro6
-rw-r--r--tools/qmlscene/qmlscene.pro6
-rw-r--r--tools/qmltestrunner/qmltestrunner.pro6
-rw-r--r--tools/qmltime/qmltime.pro7
11 files changed, 0 insertions, 67 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index d0083c0e78..71ba06c6ca 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -9,12 +9,6 @@ RESOURCES += qml.qrc
QMAKE_TARGET_PRODUCT = qml
QMAKE_TARGET_DESCRIPTION = Utility that loads and displays QML documents
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
mac {
OTHER_FILES += Info.plist
QMAKE_INFO_PLIST = Info.plist
diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro
index 534bc9fe98..d86bdfe546 100644
--- a/tools/qmleasing/qmleasing.pro
+++ b/tools/qmleasing/qmleasing.pro
@@ -20,10 +20,4 @@ FORMS += \
QMAKE_TARGET_PRODUCT = qmleasing
QMAKE_TARGET_DESCRIPTION = QML easing curve editor
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_app)
diff --git a/tools/qmlimportscanner/qmlimportscanner.pro b/tools/qmlimportscanner/qmlimportscanner.pro
index 363424f948..bd31647183 100644
--- a/tools/qmlimportscanner/qmlimportscanner.pro
+++ b/tools/qmlimportscanner/qmlimportscanner.pro
@@ -8,10 +8,4 @@ SOURCES += main.cpp
QMAKE_TARGET_PRODUCT = qmlimportscanner
QMAKE_TARGET_DESCRIPTION = Tool to scan projects for QML imports
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmljs/qmljs.pro b/tools/qmljs/qmljs.pro
index 9f82f48980..1a4f48d64c 100644
--- a/tools/qmljs/qmljs.pro
+++ b/tools/qmljs/qmljs.pro
@@ -8,10 +8,4 @@ include($$PWD/../../src/3rdparty/masm/masm-defs.pri)
QMAKE_TARGET_PRODUCT = qmljs
QMAKE_TARGET_DESCRIPTION = QML Javascript tool
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmllint/qmllint.pro b/tools/qmllint/qmllint.pro
index 27af880c8c..fe6a1b9cbc 100644
--- a/tools/qmllint/qmllint.pro
+++ b/tools/qmllint/qmllint.pro
@@ -7,10 +7,4 @@ SOURCES += main.cpp
QMAKE_TARGET_PRODUCT = qmllint
QMAKE_TARGET_DESCRIPTION = QML syntax verifier
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro
index f5248e1b69..b8bb44f64f 100644
--- a/tools/qmlmin/qmlmin.pro
+++ b/tools/qmlmin/qmlmin.pro
@@ -5,10 +5,4 @@ SOURCES += main.cpp
QMAKE_TARGET_PRODUCT = qmlmin
QMAKE_TARGET_DESCRIPTION = QML/JS minifier
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 2749ec943f..e60720626b 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -25,10 +25,4 @@ macx {
QMAKE_TARGET_PRODUCT = qmlplugindump
QMAKE_TARGET_DESCRIPTION = QML plugin dump tool
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro
index b5bb1dcc46..8507f4574b 100644
--- a/tools/qmlprofiler/qmlprofiler.pro
+++ b/tools/qmlprofiler/qmlprofiler.pro
@@ -17,10 +17,4 @@ HEADERS += \
QMAKE_TARGET_PRODUCT = qmlprofiler
QMAKE_TARGET_DESCRIPTION = QML profiler
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index ec73f1871a..4684cae2e9 100644
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -10,10 +10,4 @@ DEFINES += QML_RUNTIME_TESTING
QMAKE_TARGET_PRODUCT = qmlscene
QMAKE_TARGET_DESCRIPTION = Utility that loads and displays QML documents
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
index 505537480c..419d6ef8a2 100644
--- a/tools/qmltestrunner/qmltestrunner.pro
+++ b/tools/qmltestrunner/qmltestrunner.pro
@@ -6,10 +6,4 @@ CONFIG += no_import_scan
QMAKE_TARGET_PRODUCT = qmltestrunner
QMAKE_TARGET_DESCRIPTION = QML test runner
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
load(qt_tool)
diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro
index ec1bcb5a03..7c047aab2a 100644
--- a/tools/qmltime/qmltime.pro
+++ b/tools/qmltime/qmltime.pro
@@ -6,11 +6,4 @@ macx:CONFIG -= app_bundle
QMAKE_TARGET_PRODUCT = qmltime
QMAKE_TARGET_DESCRIPTION = Tool for benchmarking the instantiation of a QML component
-
-win32 {
- VERSION = $${QT_VERSION}.0
-} else {
- VERSION = $${QT_VERSION}
-}
-
SOURCES += qmltime.cpp