diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2008-12-11 20:22:12 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2008-12-11 20:22:12 +0100 |
| commit | 54cdf5a4fcec50c74a4db27b883d9d0eff36bf16 (patch) | |
| tree | 907fd2e88d3515dd44932e2b69cb9e78746e0d12 | |
| parent | 5c1a421f73d9688341ace9c4dd4db59c3ef4b988 (diff) | |
qt-embedded-4.4.3: rename QtUiTools to QtUiToolsE
| -rw-r--r-- | packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch | 15 | ||||
| -rw-r--r-- | packages/qt4/qt-embedded_4.4.3.bb | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch b/packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch new file mode 100644 index 0000000000..1c64e9d305 --- /dev/null +++ b/packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch @@ -0,0 +1,15 @@ +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/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb index d246cd0ce7..126f53f3cc 100644 --- a/packages/qt4/qt-embedded_4.4.3.bb +++ b/packages/qt4/qt-embedded_4.4.3.bb @@ -3,7 +3,7 @@ require qtopia-core.inc PROVIDES += "qtopia-core" RPROVIDES_${PN} = "qtopia-core" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://qconfig-oe.h \ @@ -11,13 +11,13 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ file://0005-fix-mkspecs.patch;patch=1 \ + file://qt-lib-infix.patch;patch=1 \ file://build-tools.patch;patch=1" S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" SRC_URI += " \ file://0006-freetype-host-includes.patch;patch=1 \ file://0007-openssl-host-includes.patch;patch=1 \ -# file://0008-backport-qt-lib-infix.patch;patch=1 \ # file://allow-configure-plugins.patch;patch=1 \ " |