[oe-commits] Jeremy Lainé : qt-embedded-4.4.3: fix previous patch

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7fc7541da3750910cf31a4b85c617b88a8512538
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7fc7541da3750910cf31a4b85c617b88a8512538

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Dec 11 20:49:30 2008 +0100

qt-embedded-4.4.3: fix previous patch

---

 packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch |   30 +++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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
index 1c64e9d..b1a443f 100644
--- a/packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch
+++ b/packages/qt4/qt-embedded-4.4.3/qt-lib-infix.patch
@@ -1,3 +1,33 @@
+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