55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
diff -ur a/qwtfunctions.pri b/qwtfunctions.pri
|
|
--- a/qwtfunctions.pri 2021-07-18 07:19:33.644367625 -0400
|
|
+++ b/qwtfunctions.pri 2023-10-26 10:12:25.650218378 -0400
|
|
@@ -12,7 +12,7 @@
|
|
defineReplace(qwtLibraryTarget) {
|
|
|
|
unset(LIBRARY_NAME)
|
|
- LIBRARY_NAME = $$1
|
|
+ LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION}
|
|
|
|
mac:contains(QWT_CONFIG, QwtFramework) {
|
|
|
|
@@ -36,7 +36,7 @@
|
|
defineTest(qwtAddLibrary) {
|
|
|
|
LIB_PATH = $$1
|
|
- LIB_NAME = $$2
|
|
+ LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION}
|
|
|
|
mac:contains(QWT_CONFIG, QwtFramework) {
|
|
|
|
diff -ur a/src/src.pro b/src/src.pro
|
|
--- a/src/src.pro 2021-07-18 07:19:33.628367286 -0400
|
|
+++ b/src/src.pro 2023-10-26 10:11:09.320983554 -0400
|
|
@@ -31,7 +31,7 @@
|
|
|
|
# we increase the SONAME for every minor number
|
|
|
|
- QWT_SONAME=libqwt.so.$${VER_MAJ}.$${VER_MIN}
|
|
+ QWT_SONAME=libqwt-qt$${QT_MAJOR_VERSION}.so.$${VER_MAJ}.$${VER_MIN}
|
|
QMAKE_LFLAGS *= $${QMAKE_LFLAGS_SONAME}$${QWT_SONAME}
|
|
QMAKE_LFLAGS_SONAME=
|
|
}
|
|
@@ -82,14 +82,17 @@
|
|
greaterThan(QT_MAJOR_VERSION, 4) {
|
|
|
|
QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}
|
|
- QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport
|
|
+
|
|
+ QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets
|
|
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Concurrent
|
|
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}PrintSupport
|
|
|
|
contains(QWT_CONFIG, QwtSvg) {
|
|
- QMAKE_PKGCONFIG_REQUIRES += Qt5Svg
|
|
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Svg
|
|
}
|
|
|
|
contains(QWT_CONFIG, QwtOpenGL) {
|
|
- QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL
|
|
+ QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}OpenGL
|
|
}
|
|
|
|
QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc
|