From f8607045c47b6713efe809e53ce04a3eb7b631e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 21 Dec 2016 18:52:16 +0100 Subject: 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 --- mkspecs/features/ctest_testcase_common.prf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mkspecs/features/ctest_testcase_common.prf') diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index 8cdad77a78..cdc5cca1d7 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -77,10 +77,11 @@ CMAKE_MODULE_VERSIONS = CMAKE_MODULES_UNDER_TEST = for (MODULE_UNDER_TEST, CMAKE_QT_MODULES_UNDER_TEST) { CMAKE_NAME = $$cmakeModuleName($$MODULE_UNDER_TEST) + ver = $$eval(QT.$${MODULE_UNDER_TEST}.VERSION) CMAKE_MODULE_VERSIONS += \ - -DCMAKE_$${CMAKE_NAME}_MODULE_MAJOR_VERSION=$$eval(QT.$${MODULE_UNDER_TEST}.MAJOR_VERSION) \ - -DCMAKE_$${CMAKE_NAME}_MODULE_MINOR_VERSION=$$eval(QT.$${MODULE_UNDER_TEST}.MINOR_VERSION) \ - -DCMAKE_$${CMAKE_NAME}_MODULE_PATCH_VERSION=$$eval(QT.$${MODULE_UNDER_TEST}.PATCH_VERSION) + -DCMAKE_$${CMAKE_NAME}_MODULE_MAJOR_VERSION=$$section(ver, ., 0, 0) \ + -DCMAKE_$${CMAKE_NAME}_MODULE_MINOR_VERSION=$$section(ver, ., 1, 1) \ + -DCMAKE_$${CMAKE_NAME}_MODULE_PATCH_VERSION=$$section(ver, ., 2, 2) CMAKE_MODULES_UNDER_TEST += $$CMAKE_NAME } CMAKE_MODULES_UNDER_TEST = $$join(CMAKE_MODULES_UNDER_TEST, ;) -- cgit v1.2.3