diff options
| author | Ihar Hrachyshka <ihar.hrachyshka@gmail.com> | 2009-06-03 05:37:11 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-06-09 23:21:18 -0400 |
| commit | aa4f2443717b56127f12c3385460547c5f5f2410 (patch) | |
| tree | 24bb863b3891632a8be78c0708dc79d9454be489 /recipes/qt4/files/0008-qt-lib-infix.patch | |
| parent | 398864f7e8e16ab60eae0d72b1f77d642a8501fa (diff) | |
qt4-embedded: reworked directory layout for the next changes.
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'recipes/qt4/files/0008-qt-lib-infix.patch')
| -rw-r--r-- | recipes/qt4/files/0008-qt-lib-infix.patch | 45 |
1 files changed, 0 insertions, 45 deletions
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 b1a443f24c..0000000000 --- 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 |