1 files changed, 86 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qwt/files/qwt6.patch b/meta-oe/recipes-qt/qwt/files/qwt6.patch
new file mode 100644
index 000000000..4fb1a9bdf
--- /dev/null
+++ b/meta-oe/recipes-qt/qwt/files/qwt6.patch
@@ -0,0 +1,86 @@
+- add support for SUFFIX_STR
+---
+diff --git a/examples/examples.pri b/examples/examples.pri
+index a6911c8..854ce89 100644
+--- a/examples/examples.pri
+++ b/examples/examples.pri
+@@ -13,9 +13,17 @@ include( $${QWT_ROOT}/qwtbuild.pri )
+ 
+ TEMPLATE     = app
+ 
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+    SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+    SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
+ INCLUDEPATH += $${QWT_ROOT}/src
+ DEPENDPATH  += $${QWT_ROOT}/src
+-DESTDIR      = $${QWT_ROOT}/examples/bin
+DESTDIR      = $${QWT_ROOT}/examples/bin$${SUFFIX_STR}
+ 
+ QMAKE_RPATHDIR *= $${QWT_ROOT}/lib
+ 
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index b0d2110..be119b7 100644
+--- a/qwtconfig.pri
+++ b/qwtconfig.pri
+@@ -30,6 +30,13 @@ QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+ QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+ QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+ 
+DEBUG_SUFFIX        = 
+RELEASE_SUFFIX      = 
+
+win32 {
+    DEBUG_SUFFIX      = d
+}
+
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+diff --git a/src/src.pro b/src/src.pro
+index beb7125..ebf8ea6 100644
+--- a/src/src.pro
+++ b/src/src.pro
+@@ -13,8 +13,16 @@ QWT_ROOT = $${PWD}/..
+ include( $${QWT_ROOT}/qwtconfig.pri )
+ include( $${QWT_ROOT}/qwtbuild.pri )
+ 
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+    SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+    SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
+ TEMPLATE          = lib
+-TARGET            = $$qtLibraryTarget(qwt)
+TARGET            = $$qtLibraryTarget(qwt)$${SUFFIX_STR}
+ 
+ DESTDIR           = $${QWT_ROOT}/lib
+ 
+diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
+index b0ed9f9..403828b 100644
+--- a/textengines/mathml/mathml.pro
+++ b/textengines/mathml/mathml.pro
+@@ -12,7 +12,15 @@ message(Beside the Qwt license you also have to take care of its license. )
+ 
+ include( $${PWD}/../textengines.pri )
+ 
+-TARGET    = $$qtLibraryTarget(qwtmathml)
+SUFFIX_STR =
+CONFIG(debug, debug|release) {
+    SUFFIX_STR = $${DEBUG_SUFFIX}
+}
+else {
+    SUFFIX_STR = $${RELEASE_SUFFIX}
+}
+
+TARGET    = $$qtLibraryTarget(qwtmathml$${SUFFIX_STR})
+ QT       += xml
+ 
+ HEADERS = \

diff --git a/meta-oe/recipes-qt/qwt/files/qwt6.patch b/meta-oe/recipes-qt/qwt/files/qwt6.patch new file mode 100644 index 000000000..4fb1a9bdf --- /dev/null +++ b/meta-oe/recipes-qt/qwt/files/qwt6.patch
@@ -0,0 +1,86 @@
	1	- add support for SUFFIX_STR
	2	---
	3	diff --git a/examples/examples.pri b/examples/examples.pri
	4	index a6911c8..854ce89 100644
	5	--- a/examples/examples.pri
	6	+++ b/examples/examples.pri
	7	@@ -13,9 +13,17 @@ include( $${QWT_ROOT}/qwtbuild.pri )
	8
	9	TEMPLATE = app
	10
	11	+SUFFIX_STR =
	12	+CONFIG(debug, debug\|release) {
	13	+ SUFFIX_STR = $${DEBUG_SUFFIX}
	14	+}
	15	+else {
	16	+ SUFFIX_STR = $${RELEASE_SUFFIX}
	17	+}
	18	+
	19	INCLUDEPATH += $${QWT_ROOT}/src
	20	DEPENDPATH += $${QWT_ROOT}/src
	21	-DESTDIR = $${QWT_ROOT}/examples/bin
	22	+DESTDIR = $${QWT_ROOT}/examples/bin$${SUFFIX_STR}
	23
	24	QMAKE_RPATHDIR *= $${QWT_ROOT}/lib
	25
	26	diff --git a/qwtconfig.pri b/qwtconfig.pri
	27	index b0d2110..be119b7 100644
	28	--- a/qwtconfig.pri
	29	+++ b/qwtconfig.pri
	30	@@ -30,6 +30,13 @@ QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
	31	QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
	32	QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
	33
	34	+DEBUG_SUFFIX =
	35	+RELEASE_SUFFIX =
	36	+
	37	+win32 {
	38	+ DEBUG_SUFFIX = d
	39	+}
	40	+
	41	######################################################################
	42	# Designer plugin
	43	######################################################################
	44	diff --git a/src/src.pro b/src/src.pro
	45	index beb7125..ebf8ea6 100644
	46	--- a/src/src.pro
	47	+++ b/src/src.pro
	48	@@ -13,8 +13,16 @@ QWT_ROOT = $${PWD}/..
	49	include( $${QWT_ROOT}/qwtconfig.pri )
	50	include( $${QWT_ROOT}/qwtbuild.pri )
	51
	52	+SUFFIX_STR =
	53	+CONFIG(debug, debug\|release) {
	54	+ SUFFIX_STR = $${DEBUG_SUFFIX}
	55	+}
	56	+else {
	57	+ SUFFIX_STR = $${RELEASE_SUFFIX}
	58	+}
	59	+
	60	TEMPLATE = lib
	61	-TARGET = $$qtLibraryTarget(qwt)
	62	+TARGET = $$qtLibraryTarget(qwt)$${SUFFIX_STR}
	63
	64	DESTDIR = $${QWT_ROOT}/lib
	65
	66	diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
	67	index b0ed9f9..403828b 100644
	68	--- a/textengines/mathml/mathml.pro
	69	+++ b/textengines/mathml/mathml.pro
	70	@@ -12,7 +12,15 @@ message(Beside the Qwt license you also have to take care of its license. )
	71
	72	include( $${PWD}/../textengines.pri )
	73
	74	-TARGET = $$qtLibraryTarget(qwtmathml)
	75	+SUFFIX_STR =
	76	+CONFIG(debug, debug\|release) {
	77	+ SUFFIX_STR = $${DEBUG_SUFFIX}
	78	+}
	79	+else {
	80	+ SUFFIX_STR = $${RELEASE_SUFFIX}
	81	+}
	82	+
	83	+TARGET = $$qtLibraryTarget(qwtmathml$${SUFFIX_STR})
	84	QT += xml
	85
	86	HEADERS = \