Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/1] qt4e-demo-image: Fix bug 999
@ 2011-08-23 10:57 Xiaofeng Yan
  2011-08-23 10:57 ` [PATCH 1/1] " Xiaofeng Yan
  0 siblings, 1 reply; 12+ messages in thread
From: Xiaofeng Yan @ 2011-08-23 10:57 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Copy metadata of qt4e-demo-image from OE for easy testing qt4e on yocto project.


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/qt4-demo-image
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4-demo-image

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qt4e-demo-image: Fix bug 999

 meta/recipes-qt/images/qt4e-base-image.bb        |   19 +
 meta/recipes-qt/images/qt4e-demo-image.bb        |   11 +
 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |   55 +++
 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |   19 +
 meta/recipes-qt/qwt/files/qt2-fix.patch          |  408 ++++++++++++++++++++++
 meta/recipes-qt/qwt/qwt-e_5.2.1.bb               |   11 +
 meta/recipes-qt/qwt/qwt.inc                      |   36 ++
 meta/recipes-qt/qwt/qwt_5.2.1.bb                 |   10 +
 meta/recipes-qt/tasks/task-qt4e.bb               |   54 +++
 9 files changed, 623 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb
 create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
 create mode 100644 meta/recipes-qt/qwt/files/qt2-fix.patch
 create mode 100644 meta/recipes-qt/qwt/qwt-e_5.2.1.bb
 create mode 100644 meta/recipes-qt/qwt/qwt.inc
 create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb
 create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb




^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 10:57 [PATCH 0/1] qt4e-demo-image: Fix bug 999 Xiaofeng Yan
@ 2011-08-23 10:57 ` Xiaofeng Yan
  2011-08-23 12:18   ` Paul Eggleton
  0 siblings, 1 reply; 12+ messages in thread
From: Xiaofeng Yan @ 2011-08-23 10:57 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

[YOCTO #999]

Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform.
This image was tested on qemuarm and can run program "qtdemoE".

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-qt/images/qt4e-base-image.bb        |   19 +
 meta/recipes-qt/images/qt4e-demo-image.bb        |   11 +
 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |   55 +++
 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |   19 +
 meta/recipes-qt/qwt/files/qt2-fix.patch          |  408 ++++++++++++++++++++++
 meta/recipes-qt/qwt/qwt-e_5.2.1.bb               |   11 +
 meta/recipes-qt/qwt/qwt.inc                      |   36 ++
 meta/recipes-qt/qwt/qwt_5.2.1.bb                 |   10 +
 meta/recipes-qt/tasks/task-qt4e.bb               |   54 +++
 9 files changed, 623 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb
 create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
 create mode 100644 meta/recipes-qt/qwt/files/qt2-fix.patch
 create mode 100644 meta/recipes-qt/qwt/qwt-e_5.2.1.bb
 create mode 100644 meta/recipes-qt/qwt/qwt.inc
 create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb
 create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb

diff --git a/meta/recipes-qt/images/qt4e-base-image.bb b/meta/recipes-qt/images/qt4e-base-image.bb
new file mode 100644
index 0000000..b8b7771
--- /dev/null
+++ b/meta/recipes-qt/images/qt4e-base-image.bb
@@ -0,0 +1,19 @@
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+
+DEPENDS += "task-qt4e"
+
+RDEPENDS_${PN} += " \
+	task-qt4e-base \
+	task-qt4e-qwt \
+	"
+
+IMAGE_INSTALL += "\
+	initscripts \
+	kernel-modules \
+	gdbserver \
+	strace \
+	module-init-tools \
+	task-qt4e-base \
+	task-qt4e-qwt \
+	${TOUCH} \
+"
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
new file mode 100644
index 0000000..23b365f
--- /dev/null
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -0,0 +1,11 @@
+require qt4e-base-image.bb
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+IMAGE_INSTALL += "\
+        qt4-embedded-demos qt4-embedded-examples qt-demo-init \
+	qt4-embedded-assistant \
+	qwt-e-examples \
+"
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
new file mode 100644
index 0000000..affb958
--- /dev/null
+++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+set -e
+
+if [ -f /usr/bin/qtdemo ]; then
+	QTDEMO="qtdemo > /var/log/Xsession.log 2> &1"
+else
+	QTDEMO="qtdemoE -qws"
+fi
+
+case "$1" in
+  start)
+	echo "Starting qtdemo"
+	if [ -f /etc/profile.d/tslib.sh ]; then
+		source /etc/profile.d/tslib.sh
+	fi
+	if [ -e $TSLIB_TSDEVICE ]; then
+		if [ ! -f /etc/pointercal ]; then
+			/usr/bin/ts_calibrate
+		fi
+		if [ $QTDEMO == qtdemo ]; then
+			Xorg &
+			export DISPLAY=:0
+			$QTDEMO &
+		else
+			QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
+		fi
+	else
+		if [ $QTDEMO == qtdemo ]; then
+			Xorg &
+			export DISPLAY=:0
+		fi
+		$QTDEMO &
+	fi
+	;;
+  stop)
+	echo "Stopping qtdemo"
+	if [ $QTDEMO == qtdemo ]; then
+		killall Xorg
+		killall qtdemo
+	else
+		killall qtdemoE
+	fi
+	;;
+  restart)
+	$0 stop
+	$0 start
+	;;
+  *)
+	echo "usage: $0 { start | stop | restart }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
new file mode 100644
index 0000000..3d7cdfc
--- /dev/null
+++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Init script for qtdemo"
+LICENSE = "MIT"
+SRC_URI = "file://qtdemo-init"
+PR = "r2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo
+}
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "qtdemo"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
diff --git a/meta/recipes-qt/qwt/files/qt2-fix.patch b/meta/recipes-qt/qwt/files/qt2-fix.patch
new file mode 100644
index 0000000..821846a
--- /dev/null
+++ b/meta/recipes-qt/qwt/files/qt2-fix.patch
@@ -0,0 +1,408 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qwt-4.2.0rc1/include/qwt_global.h~qt2-fix
++++ qwt-4.2.0rc1/include/qwt_global.h
+@@ -58,7 +58,7 @@
+ #define QWT_EXPORT
+ #endif
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+ // Use old QArray instead of QMemArray
+ #define QWT_NO_MEMARRAY 
+ #endif
+@@ -68,7 +68,7 @@
+ #undef QWT_NO_STL
+ // #define QWT_NO_STL // disable Standard Template Library based classes
+ #if defined(_MSC_VER)
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+ // tmake does not produce the missing -GX flag for exception handling
+ #define QWT_NO_STL
+ #else
+--- qwt-4.2.0rc1/include/qwt_picker.h~qt2-fix
++++ qwt-4.2.0rc1/include/qwt_picker.h
+@@ -89,7 +89,7 @@
+     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
+     Q_PROPERTY(bool isEnabled READ isEnabled WRITE setEnabled)
+ 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     // Unfortunately moc is not aware of #ifdefs. To enable the QPen
+     // attributes as properties uncomment the following lines.
+ 
+--- qwt-4.2.0rc1/src/qwt_text.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_text.cpp
+@@ -337,7 +337,7 @@
+ //! Set the font
+ void QwtRichText::setFont(const QFont &font)
+ {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     d_doc->setDefaultFont(font);
+ #endif
+     QwtText::setFont(font);
+@@ -359,7 +359,7 @@
+ */
+ int QwtRichText::heightForWidth(int width) const
+ {
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     const QFont defaultFont = QFont::defaultFont();
+     QFont::setDefaultFont(font());
+ #endif
+@@ -367,7 +367,7 @@
+     const QwtLayoutMetrics metrics(QwtPainter::metricsMap());
+     const int height = metrics.heightForWidth(*d_doc, width);
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     QFont::setDefaultFont(defaultFont);
+ #endif
+ 
+@@ -390,7 +390,7 @@
+     painter->save();
+ 
+     painter->setPen(color());
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     const QFont defaultFont = QFont::defaultFont();
+     QFont::setDefaultFont(font());
+ #else
+@@ -399,7 +399,7 @@
+ 
+     QwtPainter::drawSimpleRichText(painter, rect, alignment(), *d_doc);
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     QFont::setDefaultFont(defaultFont);
+ #endif
+     painter->restore();
+@@ -407,7 +407,7 @@
+ 
+ QRect QwtRichText::boundingRect(QPainter *painter) const
+ {
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     const QFont defaultFont = QFont::defaultFont();
+     QFont::setDefaultFont(font());
+ #endif
+@@ -415,7 +415,7 @@
+     const QwtLayoutMetrics metrics(QwtPainter::metricsMap());
+     const QRect rect = metrics.boundingRect(*d_doc, alignment(), painter);
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     QFont::setDefaultFont(defaultFont);
+ #endif
+ 
+@@ -428,7 +428,7 @@
+     QString rich = text;
+ 
+     // By default QwtSimpleRichText is Qt::AlignLeft
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     if (align & Qt::AlignJustify) 
+     {
+         rich.prepend("<div align=\"justify\">");
+--- qwt-4.2.0rc1/src/qwt_push_button.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_push_button.cpp
+@@ -88,7 +88,7 @@
+                 !(d_button->alignment() & Qt::AlignCenter))
+             {
+                 const QRect contentsRect =
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+                     d_button->style().subRect( 
+                         QStyle::SR_PushButtonContents, d_button);
+ #else
+@@ -103,7 +103,7 @@
+                 // Many styles move the label right/down
+                 // when the button is down.
+ 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+                 const QRect &r = *((QRect *)param[0].rect);
+ #else
+                 const QRect r(*param[0].point, param[1].pixmap->size());
+@@ -133,7 +133,7 @@
+                 d_inFilter = TRUE;
+ 
+                 d_button->style().drawItem(painter, 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+                     pixRect,
+ #else
+                     pixRect.x(), pixRect.y(), 
+@@ -150,7 +150,7 @@
+                 // We save the position of the icon. We need it later
+                 // to align the label pixmap. Hope that there are no styles
+                 // that paint the pixmap before the icon.
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+                 d_iconRect = QRect(*param[0].point, param[1].pixmap->size());
+ #else
+                 d_iconRect = *param[0].rect;
+@@ -427,7 +427,7 @@
+ 
+     QPainter picPainter(&paintFilter);
+ 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     // When painting to QPicture the dotted line of the focus rect is
+     // set to solid. ( 06.08.2003 )
+     // So we don´t set the Style_HasFocus flag and paint the focus rect
+@@ -459,7 +459,7 @@
+ 
+     paintFilter.play(painter); 
+ 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     if (hasFocus())
+     {
+         // Paint the focus rect on top of the button label.
+--- qwt-4.2.0rc1/src/qwt_layout_metrics.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_layout_metrics.cpp
+@@ -212,7 +212,7 @@
+ QRect QwtMetricsMap::translate(
+     const QWMatrix &m, const QRect &rect) 
+ {
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     return m.map(rect.normalize());
+ #else
+     return m.mapRect(rect);
+@@ -227,7 +227,7 @@
+ QPointArray QwtMetricsMap::translate(
+     const QWMatrix &m, const QPointArray &pa) 
+ {
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     return m.map(pa);
+ #else
+     return m * pa;
+--- qwt-4.2.0rc1/src/qwt_slider.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_slider.cpp
+@@ -353,7 +353,7 @@
+     {
+         const QRect rect = d_sliderRect;
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().drawFocusRect(painter, rect, colorGroup());
+ #else
+         style().drawPrimitive(QStyle::PE_FocusRect, painter,
+--- qwt-4.2.0rc1/src/qwt_counter.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_counter.cpp
+@@ -330,7 +330,7 @@
+     // QLineEdit::minimumSizeHint is for one char. Subtracting
+     // the size for the char we get all the margins, frames ...
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     w += d_valueEdit->minimumSizeHint().width() - fm.maxWidth();
+ #else
+     w += 2 * d_valueEdit->frameWidth() + 
+--- qwt-4.2.0rc1/src/qwt_paint
++++ /dev/null
+--- qwt-4.2.0rc1/src/qwt_painter.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_painter.cpp
+@@ -201,7 +201,7 @@
+     QColorGroup cg;
+     cg.setColor(QColorGroup::Text, painter->pen().color());
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     const QFont defaultFont = QFont::defaultFont();
+     QFont::setDefaultFont(painter->font());
+ #endif
+@@ -220,7 +220,7 @@
+ 
+     text.draw(painter, scaledRect.x(), y, scaledRect, cg);
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     QFont::setDefaultFont(defaultFont);
+ #endif
+ }
+--- qwt-4.2.0rc1/src/qwt_dial.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_dial.cpp
+@@ -491,7 +491,7 @@
+         // because round objects doesn´t cover all pixels.
+ 
+         QRect br = boundingRect();
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+ #ifdef _WS_WIN32_
+         // Qt-230-NC draws ellipses not as nicely as Qt-2.3.x on X Windows
+         br.setTop(br.top()-1);
+@@ -1044,7 +1044,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -1078,7 +1078,7 @@
+             setValue(maxValue());
+             break;
+         default:;
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+             e->ignore();
+ #endif
+     }
+--- qwt-4.2.0rc1/src/qwt_knob.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_knob.cpp
+@@ -279,7 +279,7 @@
+     {
+         QRect r = rect();
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().drawFocusRect(painter, r, colorGroup());
+ #else
+         style().drawPrimitive(QStyle::PE_FocusRect, painter,
+--- qwt-4.2.0rc1/src/qwt_arrbtn.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_arrbtn.cpp
+@@ -58,7 +58,7 @@
+ QRect QwtArrowButton::labelRect() const
+ {
+     QRect r =
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().buttonRect(rect().x(), rect().y(),
+         rect().width(), rect().height());
+ #else
+@@ -71,7 +71,7 @@
+     if ( isDown() )
+     {
+         int ph, pv;
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().getButtonShift(ph, pv);
+ #else
+         ph = style().pixelMetric(
+@@ -135,7 +135,7 @@
+     }
+     p->restore();
+ 
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     if ( hasFocus() )
+     {
+         const QRect focusRect =  
+@@ -218,7 +218,7 @@
+     if ( d_arrowType == Qt::UpArrow || d_arrowType == Qt::DownArrow )
+         sz.transpose();
+ 
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+     int bm = style().buttonMargin() - 1;
+     sz += QSize(2 * bm, 2 * bm);
+ #else
+--- qwt-4.2.0rc1/src/qwt_wheel.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_wheel.cpp
+@@ -453,7 +453,7 @@
+     {
+         QRect r = rect();
+     
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().drawFocusRect(painter, r, colorGroup());
+ #else
+         style().drawPrimitive(QStyle::PE_FocusRect, painter,
+--- qwt-4.2.0rc1/src/qwt_plot_canvas.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_plot_canvas.cpp
+@@ -195,7 +195,7 @@
+ 
+ void QwtPlotCanvas::drawFocusIndicator(QPainter *painter, const QRect &rect)
+ {
+-#if QT_VERSION < 300
++#if QT_VERSION < 0x030000
+         style().drawFocusRect(painter, rect, colorGroup());
+ #else
+         style().drawPrimitive(QStyle::PE_FocusRect, painter,
+--- qwt-4.2.0rc1/src/qwt_sldbase.cpp~qt2-fix
++++ qwt-4.2.0rc1/src/qwt_sldbase.cpp
+@@ -115,7 +115,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -166,7 +166,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -274,7 +274,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -304,7 +304,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -341,7 +341,7 @@
+ {
+     if ( isReadOnly() )
+     {
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->ignore();
+ #endif
+         return;
+@@ -370,7 +370,7 @@
+                 increment = 1;
+             break;
+         default:;
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+             e->ignore();
+ #endif
+     }
+--- qwt-4.2.0rc1/examples/realtime_plot/scrollbar.cpp~qt2-fix
++++ qwt-4.2.0rc1/examples/realtime_plot/scrollbar.cpp
+@@ -154,7 +154,7 @@
+ int ScrollBar::extent() const
+ {
+     int dim;
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+     dim = style().pixelMetric(QStyle::PM_ScrollBarExtent, this);
+ #else
+     const QSize sz = style().scrollBarExtent();
+--- qwt-4.2.0rc1/examples/event_filter/colorbar.cpp~qt2-fix
++++ qwt-4.2.0rc1/examples/event_filter/colorbar.cpp
+@@ -48,7 +48,7 @@
+         const QRgb rgb = pm.convertToImage().pixel(e->x(), e->y());
+     
+         emit selected(QColor(rgb));
+-#if QT_VERSION >= 300
++#if QT_VERSION >= 0x030000
+         e->accept();
+ #endif
+     }
diff --git a/meta/recipes-qt/qwt/qwt-e_5.2.1.bb b/meta/recipes-qt/qwt/qwt-e_5.2.1.bb
new file mode 100644
index 0000000..81e2ab8
--- /dev/null
+++ b/meta/recipes-qt/qwt/qwt-e_5.2.1.bb
@@ -0,0 +1,11 @@
+inherit qt4e
+
+require qwt.inc
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27"
+SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f"
+
+RPROVIDES_${PN}-dev = "libqwt-dev"
diff --git a/meta/recipes-qt/qwt/qwt.inc b/meta/recipes-qt/qwt/qwt.inc
new file mode 100644
index 0000000..87ee926
--- /dev/null
+++ b/meta/recipes-qt/qwt/qwt.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = "Qt Widget Extension for Technical Applications"
+SECTION = "libs"
+PRIORITY = "optional"
+
+# LGPLv2.1 + some exceptions
+LICENSE = "QWTv1.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt"
+
+S = "${WORKDIR}/qwt-${PV}"
+#OE_CFLAGS += "-lX11"
+CFLAGS += "-lx11 -lX11"
+
+CXXFLAGS += "-lX11 -lx11"
+do_configure_prepend() {
+	sed -i -e 's:RELEASE_SUFFIX      = :RELEASE_SUFFIX      = ${QT_LIBINFIX} :' *.pri
+	sed -i -e s:lqwt:lqwt${QT_LIBINFIX}:g -e s:/usr/local/qwt-$\${QwtVersion}:${prefix}:g *.prf
+	sed -e 's/#CONFIG     += QwtExamples/CONFIG     += QwtExamples/g' -i qwtconfig.pri
+	sed -i -e s:/usr/local/qwt-${PV}:${D}${prefix}:g ${S}/*.pri
+}
+
+do_install() {
+	oe_runmake -e install
+	install -d ${D}${datadir}/doc/${PN}
+	mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/
+	cd ${S}/examples
+	install -d ${D}/${bindir}
+	cd ${S}/examples/bin${QT_LIBINFIX}/
+	for i in * ; do
+		cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX}
+	done
+}
+
+PACKAGES_prepend = "${PN}-examples "
+FILES_${PN}-examples = "${bindir}/*"
+
diff --git a/meta/recipes-qt/qwt/qwt_5.2.1.bb b/meta/recipes-qt/qwt/qwt_5.2.1.bb
new file mode 100644
index 0000000..ed04fe4
--- /dev/null
+++ b/meta/recipes-qt/qwt/qwt_5.2.1.bb
@@ -0,0 +1,10 @@
+inherit qt4x11
+
+require qwt.inc
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27"
+SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f"
+
+RPROVIDES_${PN}-dev = "libqwt-dev"
diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/tasks/task-qt4e.bb
new file mode 100644
index 0000000..52f9419
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-qt4e.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "QT4 Embedded base Image Feed"
+PR = "r0"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit task
+
+PACKAGES += " \
+	${PN}-base \
+	${PN}-qwt \
+"
+
+RDEPENDS_${PN}-base = " \
+	busybox \
+	qt4-embedded \
+	libqt-embedded3support4 \
+	libqt-embeddedclucene4 \
+	libqt-embeddedcore4 \
+	libqt-embeddeddbus4 \
+	libqt-embeddedgui4 \
+	libqt-embeddedhelp4 \
+	libqt-embeddedmultimedia4 \
+	libqt-embeddednetwork4 \
+	libqt-embeddedscript4 \
+	libqt-embeddedscripttools4 \
+	libqt-embeddedsql4 \
+	libqt-embeddedsvg4 \
+	libqt-embeddedtest4 \
+	libqt-embeddedwebkit4 \
+	libqt-embeddedxml4 \
+	qt4-embedded-fonts-ttf-dejavu \
+	qt4-embedded-fonts-ttf-vera \
+	qt4-embedded-plugin-iconengine-svgicon \
+	qt4-embedded-plugin-imageformat-gif \
+	qt4-embedded-plugin-imageformat-ico \
+	qt4-embedded-plugin-imageformat-jpeg \
+	qt4-embedded-plugin-imageformat-mng \
+	qt4-embedded-plugin-imageformat-svg \
+	qt4-embedded-plugin-imageformat-tiff \
+	qt4-embedded-plugin-mousedriver-tslib \
+	qt4-embedded-plugin-phonon-backend-gstreamer \
+	qt4-embedded-plugin-script-dbus \
+	qt4-embedded-plugin-sqldriver-sqlite \
+"
+
+RRECOMMENDS_${PN}-base = " \
+	libqt-embeddedxmlpatterns4 \
+"
+
+RDEPENDS_${PN}-qwt = "\
+	qwt-e \
+"
-- 
1.7.0.4




^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 10:57 ` [PATCH 1/1] " Xiaofeng Yan
@ 2011-08-23 12:18   ` Paul Eggleton
  2011-08-23 12:27     ` Koen Kooi
  0 siblings, 1 reply; 12+ messages in thread
From: Paul Eggleton @ 2011-08-23 12:18 UTC (permalink / raw)
  To: Xiaofeng Yan; +Cc: Patches and discussions about the oe-core layer

On Tuesday 23 August 2011 11:57:35 Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> [YOCTO #999]
> 
> Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on
> embedded platform. This image was tested on qemuarm and can run program
> "qtdemoE".

I don't think we should pull in qwt in OE-core (or at least, we shouldn't drag 
it in just for this.) Also I would recommend trying to make the image inherit 
from core-image as well to avoid much of the generic boilerplate that's in 
there.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre



^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 12:18   ` Paul Eggleton
@ 2011-08-23 12:27     ` Koen Kooi
  2011-08-23 12:53       ` Paul Eggleton
  0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-08-23 12:27 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton


Op 23 aug. 2011, om 14:18 heeft Paul Eggleton het volgende geschreven:

> On Tuesday 23 August 2011 11:57:35 Xiaofeng Yan wrote:
>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>> 
>> [YOCTO #999]
>> 
>> Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on
>> embedded platform. This image was tested on qemuarm and can run program
>> "qtdemoE".
> 
> I don't think we should pull in qwt in OE-core (or at least, we shouldn't drag 
> it in just for this.) Also I would recommend trying to make the image inherit 
> from core-image as well to avoid much of the generic boilerplate that's in 
> there.

I would lean toward a seperate meta-qt layer, not sure if it should be hosted in the oe-core git repo, meta-oe or a completely seperate git repo.

regards,

Koen


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 12:27     ` Koen Kooi
@ 2011-08-23 12:53       ` Paul Eggleton
  2011-08-23 15:10         ` Koen Kooi
  0 siblings, 1 reply; 12+ messages in thread
From: Paul Eggleton @ 2011-08-23 12:53 UTC (permalink / raw)
  To: Koen Kooi; +Cc: Patches and discussions about the oe-core layer

On Tuesday 23 August 2011 13:27:11 you wrote:
> I would lean toward a seperate meta-qt layer, not sure if it should be
> hosted in the oe-core git repo, meta-oe or a completely seperate git repo.

Possibly we should have meta-qt for Qt applications and additional libraries 
such as Qwt (and I'm all for moving our current Qt apps there, they don't 
really belong in OE-core IMHO). If you're suggesting moving out Qt itself 
though, I think Qt belongs in OE-core, certainly as much as GTK+ does.

The purpose of having these images was to have a simple way to test that Qt 
has built correctly and is functional. If Qt is in OE-core I don't think 
that's unreasonable.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre



^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 12:53       ` Paul Eggleton
@ 2011-08-23 15:10         ` Koen Kooi
  2011-08-24  0:16           ` Saul Wold
  0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-08-23 15:10 UTC (permalink / raw)
  To: Paul Eggleton; +Cc: Patches and discussions about the oe-core layer


Op 23 aug. 2011, om 14:53 heeft Paul Eggleton het volgende geschreven:

> On Tuesday 23 August 2011 13:27:11 you wrote:
>> I would lean toward a seperate meta-qt layer, not sure if it should be
>> hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
> 
> Possibly we should have meta-qt for Qt applications and additional libraries 
> such as Qwt (and I'm all for moving our current Qt apps there, they don't 
> really belong in OE-core IMHO). If you're suggesting moving out Qt itself 
> though, I think Qt belongs in OE-core, certainly as much as GTK+ does.

I still say that gtk+ should be in it's own layer as well :) I hope to have some time in september to come up with a proposal to rearrange oe-core and meta-oe in a more logical set of layers.


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-23 15:10         ` Koen Kooi
@ 2011-08-24  0:16           ` Saul Wold
  2011-08-24  1:04             ` Paul Eggleton
  0 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2011-08-24  0:16 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton, Koen Kooi

On 08/23/2011 08:10 AM, Koen Kooi wrote:
>
> Op 23 aug. 2011, om 14:53 heeft Paul Eggleton het volgende geschreven:
>
>> On Tuesday 23 August 2011 13:27:11 you wrote:
>>> I would lean toward a seperate meta-qt layer, not sure if it should be
>>> hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
>>
>> Possibly we should have meta-qt for Qt applications and additional libraries
>> such as Qwt (and I'm all for moving our current Qt apps there, they don't
>> really belong in OE-core IMHO). If you're suggesting moving out Qt itself
>> though, I think Qt belongs in OE-core, certainly as much as GTK+ does.
>
> I still say that gtk+ should be in it's own layer as well :) I hope to have some time in september to come up with a proposal to rearrange oe-core and meta-oe in a more logical set of layers.

Yea, we should discuss this further (post 1.1) for me, while I think 
it's important to have some demos/test with the oe-core (if we keep it 
in oe-core), I am not sure we should have all the tests there.

I would suggest possibly renaming the current meta-qt3 to meta-qt and 
including this set of demos there.

Comments?

Sau!


We already have a QT3 layer, maybe it makes sense to make that a generic 
meta-qt layer and have things reside in it.

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] qt4e-demo-image: Fix bug 999
  2011-08-24  0:16           ` Saul Wold
@ 2011-08-24  1:04             ` Paul Eggleton
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Eggleton @ 2011-08-24  1:04 UTC (permalink / raw)
  To: Saul Wold; +Cc: Patches and discussions about the oe-core layer

On Wednesday 24 August 2011 01:16:30 you wrote:
> I would suggest possibly renaming the current meta-qt3 to meta-qt and
> including this set of demos there.

We really don't want to mix Qt 3 and Qt 4; we really only have a layer for Qt 
3 for LSB, I doubt anyone will actually use it.

By the way, in case there is some confusion, these are not extra demos. The 
demo images should merely bring in packages we are already building as part of 
Qt 4, nothing more.

IMHO, these images either belong together with Qt 4 (whereever that might be) 
or in a separate tests layer that contains testing items for everything in OE-
core. However, now isn't really the time to be making those reorganisations; 
so either we drop this task for this cycle or we add them to OE-core, that's 
the decision that needs to be made.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre



^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 0/1] qt4e-demo-image: Fix bug 999
@ 2011-08-24  6:34 Xiaofeng Yan
  0 siblings, 0 replies; 12+ messages in thread
From: Xiaofeng Yan @ 2011-08-24  6:34 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Paul,

Thank you for your very good suggestion for building a qt4e-demo-image.
I modified some .bb files and removed qwt according to your suggestion.
If you have any suggestion for these patches, I will continue modifying it. 

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/qt4e-demo-image
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4e-demo-image

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qt4e-demo-image: Fix bug 999

 meta/recipes-qt/images/qt4e-base-image.bb        |   14 ++++++
 meta/recipes-qt/images/qt4e-demo-image.bb        |   12 +++++
 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |   55 ++++++++++++++++++++++
 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |   19 ++++++++
 meta/recipes-qt/tasks/task-qt4e.bb               |   48 +++++++++++++++++++
 5 files changed, 148 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb
 create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
 create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
 create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb




^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 0/1] qt4e-demo-image: Fix bug 999
@ 2011-08-26  2:24 Xiaofeng Yan
  0 siblings, 0 replies; 12+ messages in thread
From: Xiaofeng Yan @ 2011-08-26  2:24 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Saul & Paul,

I merged qt4e-base-image.bb to qt4e-demoo-image.bb according to your suggestion. 
If you have any suggestion, I will modify them again.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/qt4e-demo-image
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4e-demo-image

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qt4e-demo-image: Fix bug 999

 meta/recipes-qt/images/qt4e-demo-image.bb |   19 ++++++++++
 meta/recipes-qt/tasks/task-qt4e.bb        |   56 +++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb
 create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb




^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 0/1]:qt4e-demo-image: Fix bug 999
@ 2011-09-05  1:47 Xiaofeng Yan
  2011-09-05 19:21 ` Richard Purdie
  0 siblings, 1 reply; 12+ messages in thread
From: Xiaofeng Yan @ 2011-09-05  1:47 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

"/bin/sh" is needed by qt4e-demo-image. I add "busybox" to this image.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/qt4e-demo-image
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4e-demo-image

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qt4e-demo-image:Fix bug 999

 meta/recipes-qt/images/qt4e-demo-image.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)




^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 0/1]:qt4e-demo-image: Fix bug 999
  2011-09-05  1:47 [PATCH 0/1]:qt4e-demo-image: " Xiaofeng Yan
@ 2011-09-05 19:21 ` Richard Purdie
  0 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-05 19:21 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Mon, 2011-09-05 at 09:47 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> "/bin/sh" is needed by qt4e-demo-image. I add "busybox" to this image.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: xiaofeng/qt4e-demo-image
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4e-demo-image
> 
> Thanks,
>     Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> 
> 
> Xiaofeng Yan (1):
>   qt4e-demo-image:Fix bug 999

Merged to master, thanks.

In the future can you make the short description as show in the line
above a little more informative though please as not many people know
what bug 999 is...

Cheers,

Richard




^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-09-05 19:26 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 10:57 [PATCH 0/1] qt4e-demo-image: Fix bug 999 Xiaofeng Yan
2011-08-23 10:57 ` [PATCH 1/1] " Xiaofeng Yan
2011-08-23 12:18   ` Paul Eggleton
2011-08-23 12:27     ` Koen Kooi
2011-08-23 12:53       ` Paul Eggleton
2011-08-23 15:10         ` Koen Kooi
2011-08-24  0:16           ` Saul Wold
2011-08-24  1:04             ` Paul Eggleton
  -- strict thread matches above, loose matches on Subject: below --
2011-08-24  6:34 [PATCH 0/1] " Xiaofeng Yan
2011-08-26  2:24 Xiaofeng Yan
2011-09-05  1:47 [PATCH 0/1]:qt4e-demo-image: " Xiaofeng Yan
2011-09-05 19:21 ` Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox