048abb8e9c
- Use the correct (edited) version of the revert to not break ABI: * de63bbd2f806b0219a60775017899cedb121581f.patch (Ironically this change breaks private ABI yet again...) - Add upstream patch to fix version string of CMake modules (boo#1045102) * fix-cmake-module-version.patch OBS-URL: https://build.opensuse.org/request/show/505943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=60
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From cb4bc34cb150d02889f5be2e54074e4e864b18ae Mon Sep 17 00:00:00 2001
|
|
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
Date: Mon, 22 May 2017 11:17:28 +0200
|
|
Subject: [PATCH] fix module version number in qt modules' cmake config files
|
|
|
|
this actually just makes the code more straight-forward.
|
|
|
|
amends f8607045c.
|
|
|
|
Task-number: QTBUG-60936
|
|
Change-Id: Iaa05b474206cf29352f9bba516936ff30b90a778
|
|
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
---
|
|
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
index 4f342d6..17da8b9 100644
|
|
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
@@ -35,7 +35,7 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
|
|
|
|
!!IF !equals(TEMPLATE, aux)
|
|
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
|
|
-set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
|
|
+set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
|
|
|
|
set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
|
|
!!ENDIF // TEMPLATE != aux
|
|
--
|
|
2.7.4
|
|
|