Pull request for new qt4 toolchain (and other mostly qt4 fixes)

Pull request for new qt4 toolchain (and other mostly qt4 fixes)

[Ihar Hrachyshka]

Hello!

Please pull qt4 toolchain support from the following repository:
git://github.com/booxter/oedev.git
If you want me to send patches to the ML please tell me then.

Thanks.

Re: Pull request for new qt4 toolchain (and other mostly qt4 fixes)

[Tom Rini]

On Sat, May 30, 2009 at 07:55:45PM +0300, Ihar Hrachyshka wrote:

> Hello!
> 
> Please pull qt4 toolchain support from the following repository:
> git://github.com/booxter/oedev.git
> If you want me to send patches to the ML please tell me then.

Yes, please post at least the summary of changes and such to the ML.
Thanks.

-- 
Tom Rini

[PATCH 00/12] different qt4 related patches

[Ihar Hrachyshka]

This patchset:
- adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
  all the needed tools ready to use for qt4-embedded development;
- adds directfb support for qt4-embedded;
- includes missing files to qt4 packages;
- fixes code style, generalize qt4 recipes and classes, reworked directory
  layout;
- occasionally ports pkg-config to INC_PR.

[PATCH 01/12] qt4-embedded: reworked directory layout for the next changes.

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/files/0003-no-tools.patch              |   16 -------
 .../qt4/files/0006-freetype-host-includes.patch    |   23 ----------
 recipes/qt4/files/0007-openssl-host-includes.patch |   23 ----------
 recipes/qt4/files/0008-qt-lib-infix.patch          |   45 --------------------
 recipes/qt4/files/4.5.1/0003-no-tools.patch        |   18 --------
 .../files/4.5.1/0006-freetype-host-includes.patch  |   20 ---------
 .../files/4.5.1/0007-openssl-host-includes.patch   |   20 ---------
 recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch    |   34 ---------------
 .../4.5.1/0010-no-simpledecoration-example.patch   |    9 ----
 recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch |   16 +++++++
 .../0006-freetype-host-includes.patch              |   23 ++++++++++
 .../0007-openssl-host-includes.patch               |   23 ++++++++++
 .../qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch |   45 ++++++++++++++++++++
 recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch |   18 ++++++++
 .../0006-freetype-host-includes.patch              |   20 +++++++++
 .../0007-openssl-host-includes.patch               |   20 +++++++++
 .../qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch |   34 +++++++++++++++
 .../0010-no-simpledecoration-example.patch         |    9 ++++
 recipes/qt4/qt4-embedded.inc                       |   40 +++++++++++++++++
 recipes/qt4/qt4-embedded_4.4.3.bb                  |   40 +----------------
 recipes/qt4/qt4-embedded_4.5.1.bb                  |   41 ++----------------
 21 files changed, 254 insertions(+), 283 deletions(-)
 delete mode 100644 recipes/qt4/files/0003-no-tools.patch
 delete mode 100644 recipes/qt4/files/0006-freetype-host-includes.patch
 delete mode 100644 recipes/qt4/files/0007-openssl-host-includes.patch
 delete mode 100644 recipes/qt4/files/0008-qt-lib-infix.patch
 delete mode 100644 recipes/qt4/files/4.5.1/0003-no-tools.patch
 delete mode 100644 recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
 delete mode 100644 recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
 delete mode 100644 recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
 delete mode 100644 recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch
 create mode 100644 recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch
 create mode 100644 recipes/qt4/qt4-embedded.inc

diff --git a/recipes/qt4/files/0003-no-tools.patch b/recipes/qt4/files/0003-no-tools.patch
deleted file mode 100644
index bb36444..0000000
--- a/recipes/qt4/files/0003-no-tools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- /tmp/src.pro	2008-07-08 10:43:30.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro	2008-07-08 11:28:24.000000000 +0200
-@@ -6,12 +6,9 @@
- wince*:{
-   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
- } else {
--    SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-+    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
-     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
--    !cross_compile {
--        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
--    }
- }
- win32:!contains(QT_EDITION, OpenSource|Console): {
-     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/files/0006-freetype-host-includes.patch b/recipes/qt4/files/0006-freetype-host-includes.patch
deleted file mode 100644
index cc8e115..0000000
--- a/recipes/qt4/files/0006-freetype-host-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
-
----
- config.tests/unix/freetype/freetype.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
-index 84974bf..ab9a6f2 100644
---- a/config.tests/unix/freetype/freetype.pri
-+++ b/config.tests/unix/freetype/freetype.pri
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
-         p = $$join(p, "", "", "/freetype2")
-         exists($$p):INCLUDEPATH *= $$p
--- 
-1.5.0.7
-
diff --git a/recipes/qt4/files/0007-openssl-host-includes.patch b/recipes/qt4/files/0007-openssl-host-includes.patch
deleted file mode 100644
index 35b71d9..0000000
--- a/recipes/qt4/files/0007-openssl-host-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:58:34 +0200
-Subject: [PATCH] openssl host includes
-
----
- config.tests/unix/openssl/openssl.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
-index 756e5fe..19b4061 100644
---- a/config.tests/unix/openssl/openssl.pri
-+++ b/config.tests/unix/openssl/openssl.pri
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
-         pp = $$join(p, "", "", "/openssl")
-         exists($$pp):INCLUDEPATH *= $$p
--- 
-1.5.0.7
-
diff --git a/recipes/qt4/files/0008-qt-lib-infix.patch b/recipes/qt4/files/0008-qt-lib-infix.patch
deleted file mode 100644
index b1a443f..0000000
--- a/recipes/qt4/files/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf
---- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf	2008-09-27 11:01:24.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf	2008-12-11 20:47:10.000000000 +0100
-@@ -2,10 +2,10 @@
- qt:load(qt)
- 
- # Include the correct version of the UiLoader library
--QTUITOOLS_LINKAGE = -lQtUiTools
-+QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
- CONFIG(debug, debug|release) {
--    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
- 
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro
---- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro	2008-09-27 11:01:29.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro	2008-12-11 20:36:40.000000000 +0100
-@@ -58,8 +58,8 @@
- include(shared/shared.pri)
- PRECOMPILED_HEADER=lib_pch.h
- 
--include(../components/component.pri)
- include(../sharedcomponents.pri)
-+include(../components/component.pri)
- 
- target.path=$$[QT_INSTALL_LIBS]
- INSTALLS        += target
-diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro
---- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro	2008-09-27 11:01:30.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro	2008-12-11 19:56:34.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -38,3 +38,4 @@
-    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
- }
- 
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/files/4.5.1/0003-no-tools.patch b/recipes/qt4/files/4.5.1/0003-no-tools.patch
deleted file mode 100644
index 3829ffc..0000000
--- a/recipes/qt4/files/4.5.1/0003-no-tools.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro	2009-02-25 22:32:41.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro	2009-03-26 17:11:07.000000000 +0100
-@@ -6,12 +6,9 @@
- wince*:{
-   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
- } else {
--    SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-+    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
-     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
-     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
--    !cross_compile {
--        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
--    }
- }
- win32:!contains(QT_EDITION, OpenSource|Console): {
-     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
deleted file mode 100644
index 987c425..0000000
--- a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
-
----
- config.tests/unix/freetype/freetype.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     # LSB doesn't allow using headers from /include or /usr/include
-     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
deleted file mode 100644
index 3409cc0..0000000
--- a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:58:34 +0200
-Subject: [PATCH] openssl host includes
-
----
- config.tests/unix/openssl/openssl.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri	2009-03-26 17:16:28.000000000 +0100
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
-     # LSB doesn't allow using headers from /include or /usr/include
-     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
deleted file mode 100644
index 3efaff3..0000000
--- a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
-@@ -2,10 +2,10 @@
- qt:load(qt)
- 
- # Include the correct version of the UiLoader library
--QTUITOOLS_LINKAGE = -lQtUiTools
-+QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
- CONFIG(debug, debug|release) {
--    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
- 
-Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -39,3 +39,4 @@
-    QMAKE_PKGCONFIG_REQUIRES += QtXml
- }
- 
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
deleted file mode 100644
index 070b4ac..0000000
--- a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro	2009-02-25 22:32:34.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro	2009-03-26 19:53:19.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE      = subdirs
--SUBDIRS       = framebuffer mousecalibration simpledecoration
-+SUBDIRS       = framebuffer mousecalibration
- 
- # install
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch
new file mode 100644
index 0000000..bb36444
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch
@@ -0,0 +1,16 @@
+--- /tmp/src.pro	2008-07-08 10:43:30.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro	2008-07-08 11:28:24.000000000 +0200
+@@ -6,12 +6,9 @@
+ wince*:{
+   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+-    SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+-    !cross_compile {
+-        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch
new file mode 100644
index 0000000..cc8e115
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch
@@ -0,0 +1,23 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 84974bf..ab9a6f2 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         p = $$join(p, "", "", "/freetype2")
+         exists($$p):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch
new file mode 100644
index 0000000..35b71d9
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch
@@ -0,0 +1,23 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
+index 756e5fe..19b4061 100644
+--- a/config.tests/unix/openssl/openssl.pri
++++ b/config.tests/unix/openssl/openssl.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         pp = $$join(p, "", "", "/openssl")
+         exists($$pp):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch
new file mode 100644
index 0000000..b1a443f
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch
@@ -0,0 +1,45 @@
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf
+--- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/features/uitools.prf	2008-09-27 11:01:24.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/features/uitools.prf	2008-12-11 20:47:10.000000000 +0100
+@@ -2,10 +2,10 @@
+ qt:load(qt)
+ 
+ # Include the correct version of the UiLoader library
+-QTUITOOLS_LINKAGE = -lQtUiTools
++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro
+--- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/lib/lib.pro	2008-09-27 11:01:29.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/lib/lib.pro	2008-12-11 20:36:40.000000000 +0100
+@@ -58,8 +58,8 @@
+ include(shared/shared.pri)
+ PRECOMPILED_HEADER=lib_pch.h
+ 
+-include(../components/component.pri)
+ include(../sharedcomponents.pri)
++include(../components/component.pri)
+ 
+ target.path=$$[QT_INSTALL_LIBS]
+ INSTALLS        += target
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro
+--- qt-embedded-linux-opensource-src-4.4.3.orig/tools/designer/src/uitools/uitools.pro	2008-09-27 11:01:30.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/tools/designer/src/uitools/uitools.pro	2008-12-11 19:56:34.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -38,3 +38,4 @@
+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ }
+ 
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch
new file mode 100644
index 0000000..3829ffc
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch
@@ -0,0 +1,18 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro	2009-02-25 22:32:41.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro	2009-03-26 17:11:07.000000000 +0100
+@@ -6,12 +6,9 @@
+ wince*:{
+   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+-    SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+-    !cross_compile {
+-        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch
new file mode 100644
index 0000000..987c425
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch
@@ -0,0 +1,20 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch
new file mode 100644
index 0000000..3409cc0
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch
@@ -0,0 +1,20 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri	2009-03-26 17:16:28.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch
new file mode 100644
index 0000000..3efaff3
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch
@@ -0,0 +1,34 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
+@@ -2,10 +2,10 @@
+ qt:load(qt)
+ 
+ # Include the correct version of the UiLoader library
+-QTUITOOLS_LINKAGE = -lQtUiTools
++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -39,3 +39,4 @@
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
+ 
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch
new file mode 100644
index 0000000..070b4ac
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch
@@ -0,0 +1,9 @@
+--- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro	2009-02-25 22:32:34.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro	2009-03-26 19:53:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE      = subdirs
+-SUBDIRS       = framebuffer mousecalibration simpledecoration
++SUBDIRS       = framebuffer mousecalibration
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
new file mode 100644
index 0000000..bae52ab
--- /dev/null
+++ b/recipes/qt4/qt4-embedded.inc
@@ -0,0 +1,40 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
+SECTION = "libs"
+LICENSE = "GPL QPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "tslib"
+INC_PR = "r11"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 \
+           file://0008-qt-lib-infix.patch;patch=1 \
+           file://0009-support-2bpp.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf \
+           "
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+QT_CONFIG_FLAGS += " \
+    -qtlibinfix E \
+    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
+    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
+    -DQT_KEYPAD_NAVIGATION \
+    "
+
+QT_BASE_NAME = "qt4-embedded"
+QT_BASE_LIB  = "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX="E"
+
+require qt4.inc
+
+inherit qt4e
+
diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb
index c7685c3..f5358a0 100644
--- a/recipes/qt4/qt4-embedded_4.4.3.bb
+++ b/recipes/qt4/qt4-embedded_4.4.3.bb
@@ -1,39 +1,3 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-SECTION = "libs"
-LICENSE = "GPL QPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
-PR = "r11"
+include qt4-embedded.inc
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
-QT_CONFIG_FLAGS += " \
-    -qtlibinfix E \
-    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
-    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
-    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
-    -DQT_KEYPAD_NAVIGATION \
-    "
-
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-
-require qt4.inc
-
-inherit qt4e
+PR = "${INC_PR}.1"
diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb
index 3ec4b9a..dff754c 100644
--- a/recipes/qt4/qt4-embedded_4.5.1.bb
+++ b/recipes/qt4/qt4-embedded_4.5.1.bb
@@ -1,39 +1,6 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-SECTION = "libs"
-LICENSE = "GPL LGPL QPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
+include qt4-embedded.inc
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://${PV}/0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
-           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
-           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://${PV}/0010-no-simpledecoration-example.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+PR = "${INC_PR}.1"
 
-QT_CONFIG_FLAGS += " \
-    -qtlibinfix E \
-    -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
-    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
-    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
-    -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
-    -DQT_KEYPAD_NAVIGATION \
-    "
-
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-
-require qt4.inc
-
-inherit qt4e
+LICENSE += "LGPL"
+SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1"
-- 
1.6.3.1

[PATCH 02/12] qt4-embedded: added directfb plugin

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4-embedded.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index bae52ab..3d986b2 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
+DEPENDS += "directfb tslib"
 INC_PR = "r11"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
@@ -23,7 +23,7 @@ S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 QT_CONFIG_FLAGS += " \
     -qtlibinfix E \
     -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
-    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
     -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \
     -DQT_KEYPAD_NAVIGATION \
-- 
1.6.3.1

[PATCH 03/12] qt4: style refinements, more generalization

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 classes/qt4e.bbclass             |    7 ++-
 recipes/qt4/qt4-embedded.inc     |   12 ++--
 recipes/qt4/qt4-tools-native.inc |    6 +-
 recipes/qt4/qt4.inc              |  104 +++++++++++++++++++-------------------
 4 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index 445ecba..f72e06b 100644
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -2,15 +2,16 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-
 inherit qmake2
 
 QT_DIR_NAME = "qtopia"
+QT_LIBINFIX = "E"
 # override variables set by qmake-base to compile Qt/Embedded apps
 #
-export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
+export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = ""
 export OE_QMAKE_EXTRA_MODULES = "network"
-EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
+EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} "
 
 # Qt4 uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 3d986b2..26b4116 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -6,6 +6,11 @@ HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
 INC_PR = "r11"
 
+QT_BASE_NAME = "qt4-embedded"
+QT_BASE_LIB  = "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX = "E"
+
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://0001-cross-compile.patch;patch=1 \
            file://0002-fix-resinit-declaration.patch;patch=1 \
@@ -21,7 +26,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 
 QT_CONFIG_FLAGS += " \
-    -qtlibinfix E \
+    -qtlibinfix ${QT_LIBINFIX} \
     -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \
@@ -29,11 +34,6 @@ QT_CONFIG_FLAGS += " \
     -DQT_KEYPAD_NAVIGATION \
     "
 
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-
 require qt4.inc
 
 inherit qt4e
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index a79eed4..4836a9d 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -22,8 +22,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -no-exceptions  \
                 -no-nas-sound \
                 -no-nis \
-                -verbose -release  -fast -static \
-                -qt3support "
+                -verbose -release -fast -static \
+                -qt3support"
 
 # yank default -e, otherwise we get the following error:
 # moc_qbuffer.cpp: No such file or directory
@@ -57,7 +57,7 @@ do_compile() {
 }
 
 do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}/
+    install -d ${STAGING_BINDIR_NATIVE}/
     install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
     for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
         install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 3deffa6..c17503d 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -1,6 +1,6 @@
 inherit qmake_base
 
-DEPENDS += " qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base"
 
 require qt4_arch.inc
 QT_ARCH := "${@qt_arch(d)}"
@@ -34,7 +34,7 @@ python __anonymous () {
         pkg = "${QT_BASE_LIB}"+ name.lower().replace("qt", "") + "4"
         # NOTE: the headers for QtAssistantClient are different
         incname = name.replace("QtAssistantClient", "QtAssistant")
-        bb.data.setVar("FILES_%s" % pkg, "%(pkg)s ${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
+        bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
         bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
                   ${libdir}/lib%(name)s${QT_LIBINFIX}.a
                   ${libdir}/lib%(name)s${QT_LIBINFIX}.la
@@ -66,8 +66,8 @@ PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*  ${QT_BASE_NAME}-translation-*"
 
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
-FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = "${bindir}/*/.debug "
+FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
+FILES_${PN}-dbg = "${bindir}/*/.debug"
 RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
 RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
 RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
@@ -134,54 +134,54 @@ do_compile() {
 }
 
 python populate_packages_prepend() {
-	translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
-	translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
-	do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
-
-	phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
-	phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
-	do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
-
-	# Package all the plugins and their -dbg version and create a meta package
-	import os
-	def qtopia_split(path, name, glob):
-		"""
-		Split the package into a normal and -dbg package and then add the
-		new packages to the meta package.
-		"""
-		plugin_dir     = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d)
-		if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)):
-			bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir)
-			return
-
-		plugin_name    = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d)
-		dev_packages = []
-		dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
-		do_split_packages(d, plugin_dir,     glob, plugin_name,     '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
-		# Create a -dbg package as well
-		plugin_dir_dbg     = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d)
-		packages = bb.data.getVar('PACKAGES',d)
-		for (file,package) in dev_packages:
-			packages = "%s %s-dbg" % (packages, package)
-			file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
-			bb.data.setVar("FILES_%s-dbg" % package, file_name, d)
-			bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) 
-
-		bb.data.setVar('PACKAGES', packages, d)
-
-	qtopia_split('accessible',  'accessible',  '^libq(.*)\.so$')
-	qtopia_split('codecs',      'codec',       '^libq(.*)\.so$')
-	qtopia_split('decorations', 'decoration',  '^libqdecoration(.*)\.so$')
-	qtopia_split('designer',    'designer',    '^lib(.*)\.so$')
-	qtopia_split('gfxdrivers',  'gfxdriver',   '^libqgfx(.*)\.so$')
-	qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$')
-	qtopia_split('iconengines', 'iconengine',  '^libq(.*)\.so$')
-	qtopia_split('imageformats','imageformat', '^libq(.*)\.so$')
-	qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$')
-	qtopia_split('sqldrivers',  'sqldriver',   '^libq(.*)\.so$')
-	qtopia_split('script',      'script',      '^libqtscript(.*)\.so$')
-	qtopia_split('styles',      'style',       '^libq(.*)\.so$')
-	qtopia_split('phonon_backend',      'phonon-backend',       '^libphonon_(.*)\.so$')
+        translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
+        translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
+        do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
+ 
+        phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
+        phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
+        do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+ 
+        # Package all the plugins and their -dbg version and create a meta package
+        import os
+        def qtopia_split(path, name, glob):
+                """
+                Split the package into a normal and -dbg package and then add the
+                new packages to the meta package.
+                """
+                plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d)
+                if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)):
+                        bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir)
+                        return
+ 
+                plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d)
+                dev_packages = []
+                dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
+                do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
+                # Create a -dbg package as well
+                plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d)
+                packages = bb.data.getVar('PACKAGES',d)
+                for (file,package) in dev_packages:
+                        packages = "%s %s-dbg" % (packages, package)
+                        file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
+                        bb.data.setVar("FILES_%s-dbg" % package, file_name, d)
+                        bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d)
+
+                bb.data.setVar('PACKAGES', packages, d)
+ 
+        qtopia_split('accessible',    'accessible',    '^libq(.*)\.so$')
+        qtopia_split('codecs',        'codec',         '^libq(.*)\.so$')
+        qtopia_split('decorations',   'decoration',    '^libqdecoration(.*)\.so$')
+        qtopia_split('designer',      'designer',      '^lib(.*)\.so$')
+        qtopia_split('gfxdrivers',    'gfxdriver',     '^libqgfx(.*)\.so$')
+        qtopia_split('mousedrivers',  'mousedriver',   '^libq(.*)mousedriver\.so$')
+        qtopia_split('iconengines',   'iconengine',    '^libq(.*)\.so$')
+        qtopia_split('imageformats',  'imageformat',   '^libq(.*)\.so$')
+        qtopia_split('inputmethods',  'inputmethod',   '^libq(.*)\.so$')
+        qtopia_split('sqldrivers',    'sqldriver',     '^libq(.*)\.so$')
+        qtopia_split('script',        'script',        '^libqtscript(.*)\.so$')
+        qtopia_split('styles',        'style',         '^libq(.*)\.so$')
+        qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$')
 }
 
 do_install() {
-- 
1.6.3.1

[PATCH 04/12] qt4-tools-native: use INC_PR

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4-tools-native.inc      |    2 ++
 recipes/qt4/qt4-tools-native_4.4.3.bb |    2 +-
 recipes/qt4/qt4-tools-native_4.5.1.bb |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index 4836a9d..0fd4f92 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -5,6 +5,8 @@ HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+INC_PR = "r4"
+
 inherit native
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index e8fc316..a734b6b 100644
--- a/recipes/qt4/qt4-tools-native_4.4.3.bb
+++ b/recipes/qt4/qt4-tools-native_4.4.3.bb
@@ -1,2 +1,2 @@
 require qt4-tools-native.inc
-PR = "r4"
+PR = "${INC_PR}.1"
diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb
index adb341d..d1962bf 100644
--- a/recipes/qt4/qt4-tools-native_4.5.1.bb
+++ b/recipes/qt4/qt4-tools-native_4.5.1.bb
@@ -1,4 +1,4 @@
 require qt4-tools-native.inc
-PR = "r1"
+PR = "${INC_PR}.1"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-- 
1.6.3.1

[PATCH 05/12] qt4-x11-free: generalize recipes, port them to INC_PR

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4-x11-free.inc                       |   34 +++++++++++++++++++
 recipes/qt4/qt4-x11-free/0003-no-tools.patch       |   18 ++++++++++
 .../qt4-x11-free/0006-freetype-host-includes.patch |   20 +++++++++++
 .../qt4-x11-free/0007-openssl-host-includes.patch  |   20 +++++++++++
 recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch   |   34 +++++++++++++++++++
 recipes/qt4/qt4-x11-free_4.4.3.bb                  |   35 ++------------------
 recipes/qt4/qt4-x11-free_4.5.1.bb                  |   33 ++-----------------
 7 files changed, 132 insertions(+), 62 deletions(-)
 create mode 100644 recipes/qt4/qt4-x11-free.inc
 create mode 100644 recipes/qt4/qt4-x11-free/0003-no-tools.patch
 create mode 100644 recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch
 create mode 100644 recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch
 create mode 100644 recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch

diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
new file mode 100644
index 0000000..23fa33f
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL QPL"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+PROVIDES = "qt4x11"
+
+INC_PR = "r10"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 \ 
+           file://0008-qt-lib-infix.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf \
+           "
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl"
+QT_BASE_NAME = "qt4"
+QT_BASE_LIB  = "libqt"
+QT_DIR_NAME = "qt4"
+QT_LIBINFIX = ""
+
+require qt4.inc
+
+inherit qt4x11
+
diff --git a/recipes/qt4/qt4-x11-free/0003-no-tools.patch b/recipes/qt4/qt4-x11-free/0003-no-tools.patch
new file mode 100644
index 0000000..3829ffc
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free/0003-no-tools.patch
@@ -0,0 +1,18 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro	2009-02-25 22:32:41.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro	2009-03-26 17:11:07.000000000 +0100
+@@ -6,12 +6,9 @@
+ wince*:{
+   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+-    SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+-    !cross_compile {
+-        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+     SRC_SUBDIRS += src_activeqt
diff --git a/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch b/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch
new file mode 100644
index 0000000..987c425
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch
@@ -0,0 +1,20 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch b/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch
new file mode 100644
index 0000000..3409cc0
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch
@@ -0,0 +1,20 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri	2009-03-26 17:16:28.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch
new file mode 100644
index 0000000..3efaff3
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch
@@ -0,0 +1,34 @@
+Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf	2009-02-25 22:32:34.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf	2009-03-26 17:17:27.000000000 +0100
+@@ -2,10 +2,10 @@
+ qt:load(qt)
+ 
+ # Include the correct version of the UiLoader library
+-QTUITOOLS_LINKAGE = -lQtUiTools
++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro	2009-02-25 22:32:42.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro	2009-03-26 17:17:27.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -39,3 +39,4 @@
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
+ 
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/qt4-x11-free_4.4.3.bb b/recipes/qt4/qt4-x11-free_4.4.3.bb
index 08a56a4..a3538c9 100644
--- a/recipes/qt4/qt4-x11-free_4.4.3.bb
+++ b/recipes/qt4/qt4-x11-free_4.4.3.bb
@@ -1,32 +1,3 @@
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL QPL"
-DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
-PROVIDES = "qt4x11"
-PR = "r10"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1 \ 
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-
-QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
-QT_BASE_NAME = "qt4"
-QT_BASE_LIB  = "libqt"
-QT_DIR_NAME = "qt4"
-QT_LIBINFIX = ""
-
-require qt4.inc
-
-inherit qt4x11
+include qt4-x11-free.inc
+PR = "${INC_PR}.1"
+QT_CONFIG_FLAGS += "-no-tablet"
diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb
index af3a7c7..1cc637a 100644
--- a/recipes/qt4/qt4-x11-free_4.5.1.bb
+++ b/recipes/qt4/qt4-x11-free_4.5.1.bb
@@ -1,31 +1,4 @@
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL LGPL QPL"
-DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
-PROVIDES = "qt4x11"
+include qt4-x11-free.inc
+LICENSE += "LGPL"
+PR = "${INC_PR}.1"
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://${PV}/0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://${PV}/0006-freetype-host-includes.patch;patch=1 \
-           file://${PV}/0007-openssl-host-includes.patch;patch=1 \ 
-           file://${PV}/0008-qt-lib-infix.patch;patch=1 \
-           file://g++.conf \
-           file://linux.conf \
-           "
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-
-QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl"
-QT_BASE_NAME = "qt4"
-QT_BASE_LIB  = "libqt"
-QT_DIR_NAME = "qt4"
-QT_LIBINFIX = ""
-
-require qt4.inc
-
-inherit qt4x11
-- 
1.6.3.1

[PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Ihar Hrachyshka]

This version doesn't include qt tools yet so it is not ready to create
crossed qt applications.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/meta/meta-toolchain-qte.bb         |   25 +++++++++++++++++++++++++
 recipes/tasks/task-qte-toolchain-host.bb   |    5 +++++
 recipes/tasks/task-qte-toolchain-target.bb |    8 ++++++++
 3 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 recipes/meta/meta-toolchain-qte.bb
 create mode 100644 recipes/tasks/task-qte-toolchain-host.bb
 create mode 100644 recipes/tasks/task-qte-toolchain-target.bb

diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb
new file mode 100644
index 0000000..49ed35e
--- /dev/null
+++ b/recipes/meta/meta-toolchain-qte.bb
@@ -0,0 +1,25 @@
+# Qt Embedded toolchain
+
+require meta-toolchain.bb
+
+TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host"
+TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
+
+SDK_SUFFIX = "toolchain-qte"
+QT_DIR_NAME = "qtopia"
+
+do_populate_sdk_append() {
+       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
+       touch $script
+       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
+       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
+       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
+       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
+       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
+       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
+       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
+
+       # Repack SDK with new environment-setup
+       cd ${SDK_OUTPUT}
+       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+}
diff --git a/recipes/tasks/task-qte-toolchain-host.bb b/recipes/tasks/task-qte-toolchain-host.bb
new file mode 100644
index 0000000..2a9b652
--- /dev/null
+++ b/recipes/tasks/task-qte-toolchain-host.bb
@@ -0,0 +1,5 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Host packages for Qt Embedded SDK"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
diff --git a/recipes/tasks/task-qte-toolchain-target.bb b/recipes/tasks/task-qte-toolchain-target.bb
new file mode 100644
index 0000000..82fa5d8
--- /dev/null
+++ b/recipes/tasks/task-qte-toolchain-target.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Target packages for Qt Embedded SDK"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} += " \
+	task-sdk-bare \
+	qt4-embedded \
+	qt4-embedded-dev"
-- 
1.6.3.1

[PATCH 07/12] qt4: fixed regexp pattern for graphics plugins

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index c17503d..629f5c5 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -173,7 +173,7 @@ python populate_packages_prepend() {
         qtopia_split('codecs',        'codec',         '^libq(.*)\.so$')
         qtopia_split('decorations',   'decoration',    '^libqdecoration(.*)\.so$')
         qtopia_split('designer',      'designer',      '^lib(.*)\.so$')
-        qtopia_split('gfxdrivers',    'gfxdriver',     '^libqgfx(.*)\.so$')
+        qtopia_split('gfxdrivers',    'gfxdriver',     '^libq(.*)\.so$')
         qtopia_split('mousedrivers',  'mousedriver',   '^libq(.*)mousedriver\.so$')
         qtopia_split('iconengines',   'iconengine',    '^libq(.*)\.so$')
         qtopia_split('imageformats',  'imageformat',   '^libq(.*)\.so$')
-- 
1.6.3.1

[PATCH 08/12] qt4: package all installed files

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4.inc |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 629f5c5..a6a2bfc 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -31,7 +31,7 @@ python __anonymous () {
     dev_packages = []
     dbg_packages = []
     for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
-        pkg = "${QT_BASE_LIB}"+ name.lower().replace("qt", "") + "4"
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
         # NOTE: the headers for QtAssistantClient are different
         incname = name.replace("QtAssistantClient", "QtAssistant")
         bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
@@ -45,6 +45,9 @@ python __anonymous () {
         lib_packages.append(pkg)
         dev_packages.append("%s-dev" % pkg)
         dbg_packages.append("%s-dbg" % pkg)
+    for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split():
+        dbg_packages.append("%s-dbg" % name)
+
     bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d)
     bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d)
     bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d)
@@ -59,7 +62,9 @@ OTHER_PACKAGES = "\
              ${QT_BASE_NAME}-examples \
              ${QT_BASE_NAME}-fonts \
              ${QT_BASE_NAME}-linguist \
-             ${QT_BASE_NAME}-pixeltool"
+             ${QT_BASE_NAME}-makeqpf \
+             ${QT_BASE_NAME}-pixeltool \
+             ${QT_BASE_NAME}-qt3to4"
 
 PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
 PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*  ${QT_BASE_NAME}-translation-*"
@@ -67,20 +72,32 @@ PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*  ${QT_BASE_NAME}-translation-*"
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
 FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = "${bindir}/*/.debug"
+FILES_${PN}-dbg = ""
 RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
 RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
 RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
 
-FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant*"
+FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
+FILES_${QT_BASE_NAME}-assistant-dbg        = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
 FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
+FILES_${QT_BASE_NAME}-common-dbg           = "${bindir}/.debug/qtconfig"
 FILES_${QT_BASE_NAME}-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
+FILES_${QT_BASE_NAME}-dbus-dbg             = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
 FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-dbg            = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/*"
 FILES_${QT_BASE_NAME}-designer             = "${bindir}/*designer*"
+FILES_${QT_BASE_NAME}-designer-dbg         = "${bindir}/.debug/*designer*"
 FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-examples-dbg         = "${bindir}/${QT_DIR_NAME}/examples/.debug/*"
 FILES_${QT_BASE_NAME}-fonts                = "${libdir}/fonts"
-FILES_${QT_BASE_NAME}-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
+FILES_${QT_BASE_NAME}-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
+FILES_${QT_BASE_NAME}-linguist-dbg         = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
 FILES_${QT_BASE_NAME}-pixeltool            = "${bindir}/pixeltool"
+FILES_${QT_BASE_NAME}-pixeltool-dbg        = "${bindir}/.debug/pixeltool"
+FILES_${QT_BASE_NAME}-qt3to4               = "${bindir}/qt3to4 ${datadir}/${QT_DIR_NAME}/q3porting.xml"
+FILES_${QT_BASE_NAME}-qt3to4-dbg           = "${bindir}/.debug/qt3to4"
+FILES_${QT_BASE_NAME}-makeqpf              = "${bindir}/makeqpf"
+FILES_${QT_BASE_NAME}-makeqpf-dbg          = "${bindir}/.debug/makeqpf"
 
 
 do_configure() {
@@ -136,7 +153,7 @@ do_compile() {
 python populate_packages_prepend() {
         translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
         translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
-        do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
+        do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
  
         phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
         phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
-- 
1.6.3.1

[PATCH 09/12] qt4: fixed pkgconfig for qt4-embedded

[Ihar Hrachyshka]

Added ${QT_LIBINFIX} for pkgconfig dependencies.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index a6a2bfc..de7ae15 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -222,6 +222,9 @@ do_install() {
     sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \
            -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \
            ${D}${libdir}/pkgconfig/*.pc
+    for name in ${QT_LIB_NAMES}; do
+           sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc
+    done
 
     install -d ${D}/${libdir}/fonts
     touch ${D}/${libdir}/fonts/fontdir
@@ -244,6 +247,9 @@ do_stage() {
     sed -i -e s#"moc_location=.*$"## \
            -e s#"uic_location=.*$"## \
            ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc
+    for name in ${QT_LIB_NAMES}; do
+           sed -i -e "/Requires/s#${name}#${name}${QT_LIBINFIX}#"g ${D}${libdir}/pkgconfig/*.pc
+    done
 
     # fix libtool files
     sed -i -e s#installed=yes#installed=no#g ${STAGE_TEMP}/${libdir}/*.la
-- 
1.6.3.1

[PATCH 10/12] qt4: create mkspecs package

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index de7ae15..f5da652 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -63,6 +63,7 @@ OTHER_PACKAGES = "\
              ${QT_BASE_NAME}-fonts \
              ${QT_BASE_NAME}-linguist \
              ${QT_BASE_NAME}-makeqpf \
+             ${QT_BASE_NAME}-mkspecs \
              ${QT_BASE_NAME}-pixeltool \
              ${QT_BASE_NAME}-qt3to4"
 
@@ -98,6 +99,7 @@ FILES_${QT_BASE_NAME}-qt3to4               = "${bindir}/qt3to4 ${datadir}/${QT_D
 FILES_${QT_BASE_NAME}-qt3to4-dbg           = "${bindir}/.debug/qt3to4"
 FILES_${QT_BASE_NAME}-makeqpf              = "${bindir}/makeqpf"
 FILES_${QT_BASE_NAME}-makeqpf-dbg          = "${bindir}/.debug/makeqpf"
+FILES_${QT_BASE_NAME}-mkspecs              = "${datadir}/${QT_DIR_NAME}/mkspecs/*"
 
 
 do_configure() {
@@ -209,7 +211,6 @@ do_install() {
 
     # XXX, FIXME, TODO: package the demos and examples properly
     rm -rf ${D}/${bindir}/${QT_DIR_NAME}
-    rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
 
     # fix pkgconfig, libtool and prl files
     sed -i -e s#-L${S}/lib##g \
-- 
1.6.3.1

[PATCH 11/12] pkg-config: migrated to INC_PR

[Ihar Hrachyshka]

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/pkgconfig/pkgconfig-native_0.23.bb |    2 ++
 recipes/pkgconfig/pkgconfig-sdk_0.23.bb    |    2 ++
 recipes/pkgconfig/pkgconfig.inc            |    2 +-
 recipes/pkgconfig/pkgconfig_0.23.bb        |    2 ++
 4 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb b/recipes/pkgconfig/pkgconfig-native_0.23.bb
index 24497a9..da728d3 100644
--- a/recipes/pkgconfig/pkgconfig-native_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb
@@ -1,6 +1,8 @@
 require pkgconfig.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
+PR = "${INC_PR}.1"
+
 S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""
diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
index 3b20371..47a5b46 100644
--- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
@@ -1,6 +1,8 @@
 require pkgconfig.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
+PR = "${INC_PR}.1"
+
 S = "${WORKDIR}/pkg-config-${PV}/"
 inherit sdk
 DEPENDS = ""
diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
index 939199b..495403e 100644
--- a/recipes/pkgconfig/pkgconfig.inc
+++ b/recipes/pkgconfig/pkgconfig.inc
@@ -5,7 +5,7 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPL"
-PR = "r7"
+INC_PR = "r7"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb b/recipes/pkgconfig/pkgconfig_0.23.bb
index 10ce0fc..8e75adc 100644
--- a/recipes/pkgconfig/pkgconfig_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig_0.23.bb
@@ -1,4 +1,6 @@
 require pkgconfig.inc
 
+PR = "${INC_PR}.1"
+
 DEPENDS += "glib-2.0"
 EXTRA_OECONF = "--with-installed-glib"
-- 
1.6.3.1

[PATCH 12/12] task-qte-toolchain: added mkspecs and new qt4-tools-sdk recipe

[Ihar Hrachyshka]

Added mkspecs, qt4-tools to toolchain tasks (now meta-toolchain-qte
works ok).

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/qt4/qt4-tools-sdk_4.5.1.bb       |   72 ++++++++++++++++++++++++++++++
 recipes/tasks/task-qte-toolchain-host.bb |    2 +
 2 files changed, 74 insertions(+), 0 deletions(-)
 create mode 100644 recipes/qt4/qt4-tools-sdk_4.5.1.bb

diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
new file mode 100644
index 0000000..db919fd
--- /dev/null
+++ b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native dbus-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+inherit sdk
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+           file://configure-lflags.patch;patch=1 \
+           file://qt-config.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
+EXTRA_OECONF = "-prefix ${prefix} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng \
+                -no-accessibility \
+                -no-cups \
+                -no-exceptions  \
+                -no-nas-sound \
+                -no-nis \
+                -verbose -release -fast -static \
+                -qt3support \
+                -I${STAGING_DIR_NATIVE}/usr/include \
+                -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
+                -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/bootstrap \
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/dbus \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+  tools/linguist/lrelease \
+  tools/linguist/lupdate \
+  tools/qdbus \
+"
+
+do_compile() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
+}
+
+do_stage() {
+    install -d ${STAGING_BINDIR_NATIVE}/
+    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
+    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
+        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
+    done
+}
+
+
diff --git a/recipes/tasks/task-qte-toolchain-host.bb b/recipes/tasks/task-qte-toolchain-host.bb
index 2a9b652..02c95a3 100644
--- a/recipes/tasks/task-qte-toolchain-host.bb
+++ b/recipes/tasks/task-qte-toolchain-host.bb
@@ -3,3 +3,5 @@ require task-sdk-host.bb
 DESCRIPTION = "Host packages for Qt Embedded SDK"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} += "qt4-tools-sdk"
-- 
1.6.3.1

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Tom Rini]

On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
> Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
> ---
>  recipes/qt4/qt4-embedded.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> index bae52ab..3d986b2 100644
> --- a/recipes/qt4/qt4-embedded.inc
> +++ b/recipes/qt4/qt4-embedded.inc
> @@ -3,7 +3,7 @@ SECTION = "libs"
>  LICENSE = "GPL QPL"
>  PRIORITY = "optional"
>  HOMEPAGE = "http://www.trolltech.com"
> -DEPENDS += "tslib"
> +DEPENDS += "directfb tslib"
>  INC_PR = "r11"

So, here's a problem.  We both don't allow use flags and we force
directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
to be the exception to this rule) rather than the main foo package.

-- 
Tom Rini

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Tom Rini]

On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:

> +do_populate_sdk_append() {
> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
> +       touch $script
> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
> +
> +       # Repack SDK with new environment-setup
> +       cd ${SDK_OUTPUT}
> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
> +}

I see two minor problems.  First, environment-setup is going to exist so
we don't need to touch it again.  In fact, the variable should still be
set, but for clarity we should just comment (in case the file gets
renamed to say environment-setup.sh (if we add in a *csh style one
too)).  Second, we should update, not recreate the tarball (tar -jf ...
--add-file=${prefix}/environment-setup, I think).

-- 
Tom Rini

Re: [PATCH 00/12] different qt4 related patches

[Tom Rini]

On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:

> This patchset:
> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
>   all the needed tools ready to use for qt4-embedded development;
> - adds directfb support for qt4-embedded;
> - includes missing files to qt4 packages;
> - fixes code style, generalize qt4 recipes and classes, reworked directory
>   layout;
> - occasionally ports pkg-config to INC_PR.

What machine / distro combinations have you tested all of this with, and
what recipes (other than meta-toolchain-qte) have you explicitly built
after?  ie have you built / run some QtE images or similar too?  Thanks.

-- 
Tom Rini

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Koen Kooi]

On 03-06-09 18:00, Tom Rini wrote:
> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>> ---
>>   recipes/qt4/qt4-embedded.inc |    4 ++--
>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>> index bae52ab..3d986b2 100644
>> --- a/recipes/qt4/qt4-embedded.inc
>> +++ b/recipes/qt4/qt4-embedded.inc
>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>   LICENSE = "GPL QPL"
>>   PRIORITY = "optional"
>>   HOMEPAGE = "http://www.trolltech.com"
>> -DEPENDS += "tslib"
>> +DEPENDS += "directfb tslib"
>>   INC_PR = "r11"
>
> So, here's a problem.  We both don't allow use flags and we force
> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
> to be the exception to this rule) rather than the main foo package.

Isn't this just creating a qt-gfxdriver-directfb.so and not impose 
runtime deps on directfb in ${PN}?

regards,

Koen

Re: [PATCH 00/12] different qt4 related patches

[Ihar Hrachyshka]

On Wed, Jun 3, 2009 at 7:10 PM, Tom Rini <trini@embeddedalley.com> wrote:
> On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:
>
>> This patchset:
>> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
>>   all the needed tools ready to use for qt4-embedded development;
>> - adds directfb support for qt4-embedded;
>> - includes missing files to qt4 packages;
>> - fixes code style, generalize qt4 recipes and classes, reworked directory
>>   layout;
>> - occasionally ports pkg-config to INC_PR.
>
> What machine / distro combinations have you tested all of this with, and
> what recipes (other than meta-toolchain-qte) have you explicitly built
> after?  ie have you built / run some QtE images or similar too?  Thanks.

I built and tested qt4-embedded (with directfb and linuxfb), meta-toolchain-qte.
I also built (but not tested) qt4-x11-free.
My machine is beagleboard.

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

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Ihar Hrachyshka]

On Wed, Jun 3, 2009 at 7:53 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> On 03-06-09 18:00, Tom Rini wrote:
>>
>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>>
>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>> ---
>>>  recipes/qt4/qt4-embedded.inc |    4 ++--
>>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>> index bae52ab..3d986b2 100644
>>> --- a/recipes/qt4/qt4-embedded.inc
>>> +++ b/recipes/qt4/qt4-embedded.inc
>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>  LICENSE = "GPL QPL"
>>>  PRIORITY = "optional"
>>>  HOMEPAGE = "http://www.trolltech.com"
>>> -DEPENDS += "tslib"
>>> +DEPENDS += "directfb tslib"
>>>  INC_PR = "r11"
>>
>> So, here's a problem.  We both don't allow use flags and we force
>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>> to be the exception to this rule) rather than the main foo package.
>
> Isn't this just creating a qt-gfxdriver-directfb.so and not impose runtime
> deps on directfb in ${PN}?

Yeap, exactly. I don't see any problem with that. We are building xorg
stuff when baking console-image. So what's the problem with directfb
then?;)

>
> regards,
>
> Koen
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Koen Kooi]

On 03-06-09 19:29, Ihar Hrachyshka wrote:
> On Wed, Jun 3, 2009 at 7:53 PM, Koen Kooi<k.kooi@student.utwente.nl>  wrote:
>> On 03-06-09 18:00, Tom Rini wrote:
>>>
>>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>>>
>>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>>> ---
>>>>   recipes/qt4/qt4-embedded.inc |    4 ++--
>>>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>>> index bae52ab..3d986b2 100644
>>>> --- a/recipes/qt4/qt4-embedded.inc
>>>> +++ b/recipes/qt4/qt4-embedded.inc
>>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>>   LICENSE = "GPL QPL"
>>>>   PRIORITY = "optional"
>>>>   HOMEPAGE = "http://www.trolltech.com"
>>>> -DEPENDS += "tslib"
>>>> +DEPENDS += "directfb tslib"
>>>>   INC_PR = "r11"
>>>
>>> So, here's a problem.  We both don't allow use flags and we force
>>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>>> to be the exception to this rule) rather than the main foo package.
>>
>> Isn't this just creating a qt-gfxdriver-directfb.so and not impose runtime
>> deps on directfb in ${PN}?
>
> Yeap, exactly. I don't see any problem with that. We are building xorg
> stuff when baking console-image. So what's the problem with directfb
> then?;)

No problem from my side, but I guess some people dislike the additional 
1 minute buildtime when building qt (which takes like 30 minutes itself).

regards,

Koen

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Tom Rini]

On Wed, Jun 03, 2009 at 06:53:01PM +0200, Koen Kooi wrote:
> On 03-06-09 18:00, Tom Rini wrote:
>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>> ---
>>>   recipes/qt4/qt4-embedded.inc |    4 ++--
>>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>> index bae52ab..3d986b2 100644
>>> --- a/recipes/qt4/qt4-embedded.inc
>>> +++ b/recipes/qt4/qt4-embedded.inc
>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>   LICENSE = "GPL QPL"
>>>   PRIORITY = "optional"
>>>   HOMEPAGE = "http://www.trolltech.com"
>>> -DEPENDS += "tslib"
>>> +DEPENDS += "directfb tslib"
>>>   INC_PR = "r11"
>>
>> So, here's a problem.  We both don't allow use flags and we force
>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>> to be the exception to this rule) rather than the main foo package.
>
> Isn't this just creating a qt-gfxdriver-directfb.so and not impose  
> runtime deps on directfb in ${PN}?

But how much stuff is now going to pick up "Oh, we have directfb" ?  Or
are you sure everything is already passing --disable-directfb that might
default to auto?

-- 
Tom Rini

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Ihar Hrachyshka]

On Wed, Jun 3, 2009 at 8:36 PM, Tom Rini <trini@embeddedalley.com> wrote:
> On Wed, Jun 03, 2009 at 06:53:01PM +0200, Koen Kooi wrote:
>> On 03-06-09 18:00, Tom Rini wrote:
>>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>>> ---
>>>>   recipes/qt4/qt4-embedded.inc |    4 ++--
>>>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>>> index bae52ab..3d986b2 100644
>>>> --- a/recipes/qt4/qt4-embedded.inc
>>>> +++ b/recipes/qt4/qt4-embedded.inc
>>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>>   LICENSE = "GPL QPL"
>>>>   PRIORITY = "optional"
>>>>   HOMEPAGE = "http://www.trolltech.com"
>>>> -DEPENDS += "tslib"
>>>> +DEPENDS += "directfb tslib"
>>>>   INC_PR = "r11"
>>>
>>> So, here's a problem.  We both don't allow use flags and we force
>>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>>> to be the exception to this rule) rather than the main foo package.
>>
>> Isn't this just creating a qt-gfxdriver-directfb.so and not impose
>> runtime deps on directfb in ${PN}?
>
> But how much stuff is now going to pick up "Oh, we have directfb" ?  Or
> are you sure everything is already passing --disable-directfb that might
> default to auto?

If so, we should fix the affected recipes not this one.

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

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Koen Kooi]

On 03-06-09 19:36, Tom Rini wrote:
> On Wed, Jun 03, 2009 at 06:53:01PM +0200, Koen Kooi wrote:
>> On 03-06-09 18:00, Tom Rini wrote:
>>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>>> ---
>>>>    recipes/qt4/qt4-embedded.inc |    4 ++--
>>>>    1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>>> index bae52ab..3d986b2 100644
>>>> --- a/recipes/qt4/qt4-embedded.inc
>>>> +++ b/recipes/qt4/qt4-embedded.inc
>>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>>    LICENSE = "GPL QPL"
>>>>    PRIORITY = "optional"
>>>>    HOMEPAGE = "http://www.trolltech.com"
>>>> -DEPENDS += "tslib"
>>>> +DEPENDS += "directfb tslib"
>>>>    INC_PR = "r11"
>>>
>>> So, here's a problem.  We both don't allow use flags and we force
>>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>>> to be the exception to this rule) rather than the main foo package.
>>
>> Isn't this just creating a qt-gfxdriver-directfb.so and not impose
>> runtime deps on directfb in ${PN}?
>
> But how much stuff is now going to pick up "Oh, we have directfb" ?  Or
> are you sure everything is already passing --disable-directfb that might
> default to auto?

That would be bugs in other recipes, and fixing those is out of scope 
for this patchset.

regards,

Koen

Re: [PATCH 02/12] qt4-embedded: added directfb plugin

[Tom Rini]

On Wed, Jun 03, 2009 at 07:46:28PM +0200, Koen Kooi wrote:
> On 03-06-09 19:36, Tom Rini wrote:
>> On Wed, Jun 03, 2009 at 06:53:01PM +0200, Koen Kooi wrote:
>>> On 03-06-09 18:00, Tom Rini wrote:
>>>> On Wed, Jun 03, 2009 at 06:37:12PM +0300, Ihar Hrachyshka wrote:
>>>>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com>
>>>>> ---
>>>>>    recipes/qt4/qt4-embedded.inc |    4 ++--
>>>>>    1 files changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
>>>>> index bae52ab..3d986b2 100644
>>>>> --- a/recipes/qt4/qt4-embedded.inc
>>>>> +++ b/recipes/qt4/qt4-embedded.inc
>>>>> @@ -3,7 +3,7 @@ SECTION = "libs"
>>>>>    LICENSE = "GPL QPL"
>>>>>    PRIORITY = "optional"
>>>>>    HOMEPAGE = "http://www.trolltech.com"
>>>>> -DEPENDS += "tslib"
>>>>> +DEPENDS += "directfb tslib"
>>>>>    INC_PR = "r11"
>>>>
>>>> So, here's a problem.  We both don't allow use flags and we force
>>>> directfb stuff to be done in foo-directfb (libxine / synaesthesia seems
>>>> to be the exception to this rule) rather than the main foo package.
>>>
>>> Isn't this just creating a qt-gfxdriver-directfb.so and not impose
>>> runtime deps on directfb in ${PN}?
>>
>> But how much stuff is now going to pick up "Oh, we have directfb" ?  Or
>> are you sure everything is already passing --disable-directfb that might
>> default to auto?
>
> That would be bugs in other recipes, and fixing those is out of scope  
> for this patchset.

If it works for you, works for me, un-objecting here.

-- 
Tom Rini

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Ihar Hrachyshka]

On Wed, Jun 3, 2009 at 7:04 PM, Tom Rini<trini@embeddedalley.com> wrote:
> On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:
>
>> +do_populate_sdk_append() {
>> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
>> +       touch $script
>> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
>> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
>> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
>> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
>> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
>> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
>> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
>> +
>> +       # Repack SDK with new environment-setup
>> +       cd ${SDK_OUTPUT}
>> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
>> +}
>
> I see two minor problems.  First, environment-setup is going to exist so
> we don't need to touch it again.  In fact, the variable should still be
> set, but for clarity we should just comment (in case the file gets
> renamed to say environment-setup.sh (if we add in a *csh style one
> too)).  Second, we should update, not recreate the tarball (tar -jf ...
> --add-file=${prefix}/environment-setup, I think).

1) Touching existing file is not a problem.
2) You can't append to compressed tar files.

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

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Tom Rini]

On Fri, Jun 05, 2009 at 11:47:04AM +0300, Ihar Hrachyshka wrote:
> On Wed, Jun 3, 2009 at 7:04 PM, Tom Rini<trini@embeddedalley.com> wrote:
> > On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:
> >
> >> +do_populate_sdk_append() {
> >> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
> >> +       touch $script
> >> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
> >> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
> >> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
> >> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
> >> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
> >> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
> >> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
> >> +
> >> +       # Repack SDK with new environment-setup
> >> +       cd ${SDK_OUTPUT}
> >> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
> >> +}
> >
> > I see two minor problems.  First, environment-setup is going to exist so
> > we don't need to touch it again.  In fact, the variable should still be
> > set, but for clarity we should just comment (in case the file gets
> > renamed to say environment-setup.sh (if we add in a *csh style one
> > too)).  Second, we should update, not recreate the tarball (tar -jf ...
> > --add-file=${prefix}/environment-setup, I think).
> 
> 1) Touching existing file is not a problem.

But changing the name (for say once my *csh using cowork or customer
bugs me about it) will break here.

> 2) You can't append to compressed tar files.

Ah, true.

-- 
Tom Rini

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Ihar Hrachyshka]

On Fri, Jun 5, 2009 at 6:45 PM, Tom Rini<trini@embeddedalley.com> wrote:
> On Fri, Jun 05, 2009 at 11:47:04AM +0300, Ihar Hrachyshka wrote:
>> On Wed, Jun 3, 2009 at 7:04 PM, Tom Rini<trini@embeddedalley.com> wrote:
>> > On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:
>> >
>> >> +do_populate_sdk_append() {
>> >> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
>> >> +       touch $script
>> >> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
>> >> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
>> >> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
>> >> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
>> >> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
>> >> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
>> >> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
>> >> +
>> >> +       # Repack SDK with new environment-setup
>> >> +       cd ${SDK_OUTPUT}
>> >> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
>> >> +}
>> >
>> > I see two minor problems.  First, environment-setup is going to exist so
>> > we don't need to touch it again.  In fact, the variable should still be
>> > set, but for clarity we should just comment (in case the file gets
>> > renamed to say environment-setup.sh (if we add in a *csh style one
>> > too)).  Second, we should update, not recreate the tarball (tar -jf ...
>> > --add-file=${prefix}/environment-setup, I think).
>>
>> 1) Touching existing file is not a problem.
>
> But changing the name (for say once my *csh using cowork or customer
> bugs me about it) will break here.

Sorry, but I don't get your point... Please explain me.

>
>> 2) You can't append to compressed tar files.
>
> Ah, true.
>
> --
> Tom Rini
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Tom Rini]

On Fri, Jun 05, 2009 at 08:35:56PM +0300, Ihar Hrachyshka wrote:
> On Fri, Jun 5, 2009 at 6:45 PM, Tom Rini<trini@embeddedalley.com> wrote:
> > On Fri, Jun 05, 2009 at 11:47:04AM +0300, Ihar Hrachyshka wrote:
> >> On Wed, Jun 3, 2009 at 7:04 PM, Tom Rini<trini@embeddedalley.com> wrote:
> >> > On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:
> >> >
> >> >> +do_populate_sdk_append() {
> >> >> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
> >> >> +       touch $script
> >> >> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
> >> >> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
> >> >> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
> >> >> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
> >> >> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
> >> >> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
> >> >> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
> >> >> +
> >> >> +       # Repack SDK with new environment-setup
> >> >> +       cd ${SDK_OUTPUT}
> >> >> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
> >> >> +}
> >> >
> >> > I see two minor problems.  First, environment-setup is going to exist so
> >> > we don't need to touch it again.  In fact, the variable should still be
> >> > set, but for clarity we should just comment (in case the file gets
> >> > renamed to say environment-setup.sh (if we add in a *csh style one
> >> > too)).  Second, we should update, not recreate the tarball (tar -jf ...
> >> > --add-file=${prefix}/environment-setup, I think).
> >>
> >> 1) Touching existing file is not a problem.
> >
> > But changing the name (for say once my *csh using cowork or customer
> > bugs me about it) will break here.
> 
> Sorry, but I don't get your point... Please explain me.

I've gone back and forth with myself on this.  My point is that it's a
little fragile, if ${SDK_OUTPUT}/${prefix}/environment-setup is renamed
(it's bash/etc-centric and for example, if my tcsh using coworker bugs
me, or a customer asks, I'll certainly make a
${SDK_OUTPUT}/${prefix}/environment-setup.csh and then push upstream,
and probably rename the old one to
${SDK_OUTPUT}/${prefix}/environment-setup.sh).  But, this isn't
happening right now, and well, even with my suggestion (using $script as
it's already set) would still be probably equally as fragile.

So, I'm happy with things as-is, sorry for the back-and-forth :)

-- 
Tom Rini

Re: [PATCH 06/12] meta-toolchain-qte: initial qt embedded toolchain version

[Ihar Hrachyshka]

On Fri, Jun 5, 2009 at 10:35 PM, Tom Rini<trini@embeddedalley.com> wrote:
> On Fri, Jun 05, 2009 at 08:35:56PM +0300, Ihar Hrachyshka wrote:
>> On Fri, Jun 5, 2009 at 6:45 PM, Tom Rini<trini@embeddedalley.com> wrote:
>> > On Fri, Jun 05, 2009 at 11:47:04AM +0300, Ihar Hrachyshka wrote:
>> >> On Wed, Jun 3, 2009 at 7:04 PM, Tom Rini<trini@embeddedalley.com> wrote:
>> >> > On Wed, Jun 03, 2009 at 06:37:16PM +0300, Ihar Hrachyshka wrote:
>> >> >
>> >> >> +do_populate_sdk_append() {
>> >> >> +       script = "${SDK_OUTPUT}/${prefix}/environment-setup"
>> >> >> +       touch $script
>> >> >> +       echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
>> >> >> +       echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
>> >> >> +       echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
>> >> >> +       echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script
>> >> >> +       echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
>> >> >> +       echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
>> >> >> +       echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
>> >> >> +
>> >> >> +       # Repack SDK with new environment-setup
>> >> >> +       cd ${SDK_OUTPUT}
>> >> >> +       fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
>> >> >> +}
>> >> >
>> >> > I see two minor problems.  First, environment-setup is going to exist so
>> >> > we don't need to touch it again.  In fact, the variable should still be
>> >> > set, but for clarity we should just comment (in case the file gets
>> >> > renamed to say environment-setup.sh (if we add in a *csh style one
>> >> > too)).  Second, we should update, not recreate the tarball (tar -jf ...
>> >> > --add-file=${prefix}/environment-setup, I think).
>> >>
>> >> 1) Touching existing file is not a problem.
>> >
>> > But changing the name (for say once my *csh using cowork or customer
>> > bugs me about it) will break here.
>>
>> Sorry, but I don't get your point... Please explain me.
>
> I've gone back and forth with myself on this.  My point is that it's a
> little fragile, if ${SDK_OUTPUT}/${prefix}/environment-setup is renamed
> (it's bash/etc-centric and for example, if my tcsh using coworker bugs
> me, or a customer asks, I'll certainly make a
> ${SDK_OUTPUT}/${prefix}/environment-setup.csh and then push upstream,
> and probably rename the old one to
> ${SDK_OUTPUT}/${prefix}/environment-setup.sh).  But, this isn't
> happening right now, and well, even with my suggestion (using $script as
> it's already set) would still be probably equally as fragile.
>
> So, I'm happy with things as-is, sorry for the back-and-forth :)

Ok, I get it :)
But for now we don't support *csh syntax for toolchain setup scripts
so there is no problem with the patch. If you want to add *csh support
feel free to send the needed patch after this patchset is committed in
tree.

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

Re: [PATCH 00/12] different qt4 related patches

[Ihar Hrachyshka]

On Wed, Jun 3, 2009 at 8:27 PM, Ihar
Hrachyshka<ihar.hrachyshka@gmail.com> wrote:
> On Wed, Jun 3, 2009 at 7:10 PM, Tom Rini <trini@embeddedalley.com> wrote:
>> On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:
>>
>>> This patchset:
>>> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
>>>   all the needed tools ready to use for qt4-embedded development;
>>> - adds directfb support for qt4-embedded;
>>> - includes missing files to qt4 packages;
>>> - fixes code style, generalize qt4 recipes and classes, reworked directory
>>>   layout;
>>> - occasionally ports pkg-config to INC_PR.
>>
>> What machine / distro combinations have you tested all of this with, and
>> what recipes (other than meta-toolchain-qte) have you explicitly built
>> after?  ie have you built / run some QtE images or similar too?  Thanks.
>
> I built and tested qt4-embedded (with directfb and linuxfb), meta-toolchain-qte.
> I also built (but not tested) qt4-x11-free.
> My machine is beagleboard.

What's the status of the patchset? Is there any problems pending before commit?

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

Re: [PATCH 00/12] different qt4 related patches

[Tom Rini]

On Sun, Jun 07, 2009 at 07:40:52PM +0300, Ihar Hrachyshka wrote:
> On Wed, Jun 3, 2009 at 8:27 PM, Ihar
> Hrachyshka<ihar.hrachyshka@gmail.com> wrote:
> > On Wed, Jun 3, 2009 at 7:10 PM, Tom Rini <trini@embeddedalley.com> wrote:
> >> On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:
> >>
> >>> This patchset:
> >>> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
> >>>   all the needed tools ready to use for qt4-embedded development;
> >>> - adds directfb support for qt4-embedded;
> >>> - includes missing files to qt4 packages;
> >>> - fixes code style, generalize qt4 recipes and classes, reworked directory
> >>>   layout;
> >>> - occasionally ports pkg-config to INC_PR.
> >>
> >> What machine / distro combinations have you tested all of this with, and
> >> what recipes (other than meta-toolchain-qte) have you explicitly built
> >> after?  ie have you built / run some QtE images or similar too?  Thanks.
> >
> > I built and tested qt4-embedded (with directfb and linuxfb), meta-toolchain-qte.
> > I also built (but not tested) qt4-x11-free.
> > My machine is beagleboard.
> 
> What's the status of the patchset? Is there any problems pending before commit?

I have no problem and Acked-by the whole series.  I do not however, have
time to commit this right now, sorry.  But anyone else, please feel free
to add:
Acked-by: Tom Rini <trini@embeddedalley.com>

And push.

-- 
Tom Rini

Re: [PATCH 00/12] different qt4 related patches

[Denys Dmytriyenko]

On Tue, Jun 09, 2009 at 07:40:03PM -0700, Tom Rini wrote:
> On Sun, Jun 07, 2009 at 07:40:52PM +0300, Ihar Hrachyshka wrote:
> > On Wed, Jun 3, 2009 at 8:27 PM, Ihar
> > Hrachyshka<ihar.hrachyshka@gmail.com> wrote:
> > > On Wed, Jun 3, 2009 at 7:10 PM, Tom Rini <trini@embeddedalley.com> wrote:
> > >> On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:
> > >>
> > >>> This patchset:
> > >>> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
> > >>>   all the needed tools ready to use for qt4-embedded development;
> > >>> - adds directfb support for qt4-embedded;
> > >>> - includes missing files to qt4 packages;
> > >>> - fixes code style, generalize qt4 recipes and classes, reworked directory
> > >>>   layout;
> > >>> - occasionally ports pkg-config to INC_PR.
> > >>
> > >> What machine / distro combinations have you tested all of this with, and
> > >> what recipes (other than meta-toolchain-qte) have you explicitly built
> > >> after?  ie have you built / run some QtE images or similar too?  Thanks.
> > >
> > > I built and tested qt4-embedded (with directfb and linuxfb), meta-toolchain-qte.
> > > I also built (but not tested) qt4-x11-free.
> > > My machine is beagleboard.
> > 
> > What's the status of the patchset? Is there any problems pending before commit?
> 
> I have no problem and Acked-by the whole series.  I do not however, have
> time to commit this right now, sorry.  But anyone else, please feel free
> to add:
> Acked-by: Tom Rini <trini@embeddedalley.com>
> 
> And push.

Acked and pushed. Patchwork updated. Thanks.

-- 
Denys

Re: [PATCH 00/12] different qt4 related patches

[Ihar Hrachyshka]

On Wed, Jun 10, 2009 at 6:29 AM, Denys Dmytriyenko<denis@denix.org> wrote:
> On Tue, Jun 09, 2009 at 07:40:03PM -0700, Tom Rini wrote:
>> On Sun, Jun 07, 2009 at 07:40:52PM +0300, Ihar Hrachyshka wrote:
>> > On Wed, Jun 3, 2009 at 8:27 PM, Ihar
>> > Hrachyshka<ihar.hrachyshka@gmail.com> wrote:
>> > > On Wed, Jun 3, 2009 at 7:10 PM, Tom Rini <trini@embeddedalley.com> wrote:
>> > >> On Wed, Jun 03, 2009 at 06:37:10PM +0300, Ihar Hrachyshka wrote:
>> > >>
>> > >>> This patchset:
>> > >>> - adds meta-toolchain-qte.bb to install toolchain with Qt/Embedded and
>> > >>>   all the needed tools ready to use for qt4-embedded development;
>> > >>> - adds directfb support for qt4-embedded;
>> > >>> - includes missing files to qt4 packages;
>> > >>> - fixes code style, generalize qt4 recipes and classes, reworked directory
>> > >>>   layout;
>> > >>> - occasionally ports pkg-config to INC_PR.
>> > >>
>> > >> What machine / distro combinations have you tested all of this with, and
>> > >> what recipes (other than meta-toolchain-qte) have you explicitly built
>> > >> after?  ie have you built / run some QtE images or similar too?  Thanks.
>> > >
>> > > I built and tested qt4-embedded (with directfb and linuxfb), meta-toolchain-qte.
>> > > I also built (but not tested) qt4-x11-free.
>> > > My machine is beagleboard.
>> >
>> > What's the status of the patchset? Is there any problems pending before commit?
>>
>> I have no problem and Acked-by the whole series.  I do not however, have
>> time to commit this right now, sorry.  But anyone else, please feel free
>> to add:
>> Acked-by: Tom Rini <trini@embeddedalley.com>
>>
>> And push.
>
> Acked and pushed. Patchwork updated. Thanks.

Thanks!

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

Re: [PATCH 12/12] task-qte-toolchain: added mkspecs and new qt4-tools-sdk recipe

[Valentin Longchamp]

Ihar Hrachyshka wrote:
> Added mkspecs, qt4-tools to toolchain tasks (now meta-toolchain-qte
> works ok).
> 
> Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
> ---
>  recipes/qt4/qt4-tools-sdk_4.5.1.bb       |   72 ++++++++++++++++++++++++++++++
>  recipes/tasks/task-qte-toolchain-host.bb |    2 +
>  2 files changed, 74 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/qt4/qt4-tools-sdk_4.5.1.bb
> 
> diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
> new file mode 100644
> index 0000000..db919fd
> --- /dev/null
> +++ b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
> @@ -0,0 +1,72 @@
> +DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
> +DEPENDS = "zlib-native dbus-native"
> +SECTION = "libs"
> +HOMEPAGE = "http://www.trolltech.com"
> +PRIORITY = "optional"
> +LICENSE = "GPL"
> +
> +inherit sdk
> +
> +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
> +           file://configure-lflags.patch;patch=1 \
> +           file://qt-config.patch;patch=1 \
> +           file://g++.conf \
> +           file://linux.conf"
> +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
> +
> +# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
> +EXTRA_OECONF = "-prefix ${prefix} \
> +                -qt-libjpeg -qt-gif -system-zlib \
> +                -no-libjpeg -no-libpng \
> +                -no-accessibility \
> +                -no-cups \
> +                -no-exceptions  \
> +                -no-nas-sound \
> +                -no-nis \
> +                -verbose -release -fast -static \
> +                -qt3support \
> +                -I${STAGING_DIR_NATIVE}/usr/include \
> +                -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
> +                -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
> +
> +# yank default -e, otherwise we get the following error:
> +# moc_qbuffer.cpp: No such file or directory
> +EXTRA_OEMAKE = " "
> +
> +do_configure() {
> +   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
> +}
> +
> +TOBUILD = "\
> +  src/tools/bootstrap \
> +  src/tools/moc \
> +  src/corelib \
> +  src/sql \
> +  src/dbus \
> +  src/qt3support \
> +  src/xml \
> +  src/tools/uic \
> +  src/tools/rcc \
> +  src/network \
> +  src/gui \
> +  src/tools/uic3 \
> +  tools/linguist/lrelease \
> +  tools/linguist/lupdate \
> +  tools/qdbus \
> +"
> +
> +do_compile() {
> +    for i in ${TOBUILD}; do
> +        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
> +    done
> +}
> +
> +do_stage() {
> +    install -d ${STAGING_BINDIR_NATIVE}/
> +    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2

Why it qmake renamed to qmake2 ? I know it's its version (current is 
2.0a), but this makes the fail the FindQt4 module in cmake (which 
heavily relies on qmake !). See below:

FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS

Having it named qmake4, just like the other qt tools below should allow 
this cmake module to find it.

> +    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
> +        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
> +    done
> +}
> +
> +
> diff --git a/recipes/tasks/task-qte-toolchain-host.bb b/recipes/tasks/task-qte-toolchain-host.bb
> index 2a9b652..02c95a3 100644
> --- a/recipes/tasks/task-qte-toolchain-host.bb
> +++ b/recipes/tasks/task-qte-toolchain-host.bb
> @@ -3,3 +3,5 @@ require task-sdk-host.bb
>  DESCRIPTION = "Host packages for Qt Embedded SDK"
>  LICENSE = "MIT"
>  ALLOW_EMPTY = "1"
> +
> +RDEPENDS_${PN} += "qt4-tools-sdk"


-- 
Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
valentin.longchamp@epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEA3485, Station 9, CH-1015 Lausanne

Re: [PATCH 12/12] task-qte-toolchain: added mkspecs and new qt4-tools-sdk recipe

[Ihar Hrachyshka]

On Thu, Jun 18, 2009 at 6:44 PM, Valentin
Longchamp<valentin.longchamp@epfl.ch> wrote:
> Ihar Hrachyshka wrote:
>>
>> Added mkspecs, qt4-tools to toolchain tasks (now meta-toolchain-qte
>> works ok).
>>
>> Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
>> ---
>>  recipes/qt4/qt4-tools-sdk_4.5.1.bb       |   72
>> ++++++++++++++++++++++++++++++
>>  recipes/tasks/task-qte-toolchain-host.bb |    2 +
>>  2 files changed, 74 insertions(+), 0 deletions(-)
>>  create mode 100644 recipes/qt4/qt4-tools-sdk_4.5.1.bb
>>
>> diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb
>> b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
>> new file mode 100644
>> index 0000000..db919fd
>> --- /dev/null
>> +++ b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
>> @@ -0,0 +1,72 @@
>> +DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
>> +DEPENDS = "zlib-native dbus-native"
>> +SECTION = "libs"
>> +HOMEPAGE = "http://www.trolltech.com"
>> +PRIORITY = "optional"
>> +LICENSE = "GPL"
>> +
>> +inherit sdk
>> +
>> +SRC_URI =
>> "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2
>> \
>> +           file://configure-lflags.patch;patch=1 \
>> +           file://qt-config.patch;patch=1 \
>> +           file://g++.conf \
>> +           file://linux.conf"
>> +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
>> +
>> +# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags
>> dbus-1"
>> +EXTRA_OECONF = "-prefix ${prefix} \
>> +                -qt-libjpeg -qt-gif -system-zlib \
>> +                -no-libjpeg -no-libpng \
>> +                -no-accessibility \
>> +                -no-cups \
>> +                -no-exceptions  \
>> +                -no-nas-sound \
>> +                -no-nis \
>> +                -verbose -release -fast -static \
>> +                -qt3support \
>> +                -I${STAGING_DIR_NATIVE}/usr/include \
>> +                -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
>> +                -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
>> +
>> +# yank default -e, otherwise we get the following error:
>> +# moc_qbuffer.cpp: No such file or directory
>> +EXTRA_OEMAKE = " "
>> +
>> +do_configure() {
>> +   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring
>> qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
>> +}
>> +
>> +TOBUILD = "\
>> +  src/tools/bootstrap \
>> +  src/tools/moc \
>> +  src/corelib \
>> +  src/sql \
>> +  src/dbus \
>> +  src/qt3support \
>> +  src/xml \
>> +  src/tools/uic \
>> +  src/tools/rcc \
>> +  src/network \
>> +  src/gui \
>> +  src/tools/uic3 \
>> +  tools/linguist/lrelease \
>> +  tools/linguist/lupdate \
>> +  tools/qdbus \
>> +"
>> +
>> +do_compile() {
>> +    for i in ${TOBUILD}; do
>> +        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
>> +    done
>> +}
>> +
>> +do_stage() {
>> +    install -d ${STAGING_BINDIR_NATIVE}/
>> +    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
>
> Why it qmake renamed to qmake2 ? I know it's its version (current is 2.0a),
> but this makes the fail the FindQt4 module in cmake (which heavily relies on
> qmake !). See below:
>
> FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
>
> Having it named qmake4, just like the other qt tools below should allow this
> cmake module to find it.

I don't know. I just copy-pasted it from qt4-tools-native. I think it
really should be fixed as you stated but for all packages (native
too).

>
>> +    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp;
>> do
>> +        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
>> +    done
>> +}
>> +
>> +
>> diff --git a/recipes/tasks/task-qte-toolchain-host.bb
>> b/recipes/tasks/task-qte-toolchain-host.bb
>> index 2a9b652..02c95a3 100644
>> --- a/recipes/tasks/task-qte-toolchain-host.bb
>> +++ b/recipes/tasks/task-qte-toolchain-host.bb
>> @@ -3,3 +3,5 @@ require task-sdk-host.bb
>>  DESCRIPTION = "Host packages for Qt Embedded SDK"
>>  LICENSE = "MIT"
>>  ALLOW_EMPTY = "1"
>> +
>> +RDEPENDS_${PN} += "qt4-tools-sdk"
>
>
> --
> Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
> valentin.longchamp@epfl.ch, Phone: +41216937827
> http://people.epfl.ch/valentin.longchamp
> MEA3485, Station 9, CH-1015 Lausanne
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>