You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
709 B
29 lines
709 B
10 years ago
|
diff -up qwt-6.1.1/qwtfunctions.pri.qt5 qwt-6.1.1/qwtfunctions.pri
|
||
|
|
--- qwt-6.1.1/qwtfunctions.pri.qt5 2014-09-18 09:59:46.659028741 -0500
|
||
|
|
+++ qwt-6.1.1/qwtfunctions.pri 2014-12-01 07:23:30.215055279 -0600
|
||
|
|
@@ -12,7 +12,12 @@
|
||
|
|
defineReplace(qwtLibraryTarget) {
|
||
|
|
|
||
|
|
unset(LIBRARY_NAME)
|
||
|
|
+
|
||
|
|
+ greaterThan(QT_MAJOR_VERSION, 4) {
|
||
|
|
+ LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION}
|
||
|
|
+ } else {
|
||
|
|
LIBRARY_NAME = $$1
|
||
|
|
+ }
|
||
|
|
|
||
|
|
mac:contains(QWT_CONFIG, QwtFramework) {
|
||
|
|
|
||
|
|
@@ -35,7 +40,11 @@ defineReplace(qwtLibraryTarget) {
|
||
|
|
|
||
|
|
defineTest(qwtAddLibrary) {
|
||
|
|
|
||
|
|
+ greaterThan(QT_MAJOR_VERSION, 4) {
|
||
|
|
+ LIB_NAME = $${1}-qt$${QT_MAJOR_VERSION}
|
||
|
|
+ } else {
|
||
|
|
LIB_NAME = $$1
|
||
|
|
+ }
|
||
|
|
|
||
|
|
unset(LINKAGE)
|
||
|
|
|