diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-21 18:52:16 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-06 16:33:18 +0000 |
| commit | f8607045c47b6713efe809e53ce04a3eb7b631e8 (patch) | |
| tree | 15695f838f6fc94ea9379c6d6db4b19a688bde1c /mkspecs/features/qml_plugin.prf | |
| parent | 47a275c0ba54862b79dc30f64d26b0ba677d5611 (diff) | |
stop exporting QT.*.{MAJOR,MINOR,PATCH}_VERSION in module pris
the only users of module versions in the first place are found within
qt's own prfs; even qbs' qt module importer ignores them. but arguably,
the information makes sense.
however, exporting the same barely useful information redundantly is
plain over the top, so remove the pre-split representation.
Change-Id: Iaee69c86d8b7c8b8ef4f3580b8da333aeb8ade2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features/qml_plugin.prf')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index de036c129e..d49f4c49c1 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -101,10 +101,10 @@ load(qt_common) build_pass|!debug_and_release { isEmpty(IMPORT_VERSION) { no_cxx_module { - IMPORT_VERSION = $$replace(MODULE_VERSION, ^(\\d+\\.\\d+).*, \\1) + IMPORT_VERSION = $$section(MODULE_VERSION, ., 0, 1) isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION") } else { - IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) + IMPORT_VERSION = $$section(QT.$${CXX_MODULE}.VERSION, ., 0, 1) } } |