diff options
| author |   Jeremy Lainé <jeremy.laine@m4x.org> | 2008-12-11 20:49:30 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2008-12-11 20:49:30 +0100 |
| commit | 7fc7541da3750910cf31a4b85c617b88a8512538 (patch) | |
| tree | 247ebeb373bd2642595e2f3fd5c34bfd700622eb /packages/qt4 | |
| parent | 54cdf5a4fcec50c74a4db27b883d9d0eff36bf16 (diff) | |
| download | openembedded-7fc7541da3750910cf31a4b85c617b88a8512538.tar.gz | |
qt-embedded-4.4.3: fix previous patch
Diffstat (limited to 'packages/qt4')
| -rw-r--r-- | 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 1c64e9d305..b1a443f24c 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 |