diff options
| author | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
| commit | a7be854977d7ad7c8460fee76739db8154e83049 (patch) | |
| tree | 3696192bc8abcae8ce4e0121df2dd4e5246541df /recipes/qt4/files/0008-qt-lib-infix.patch | |
| parent | e2718269c5f56774705478545316a879f0be82c4 (diff) | |
| parent | 1b045e71ce7c3b7ed6c68ae1d60e974edbe38efc (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
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, 45 insertions, 0 deletions
diff --git a/recipes/qt4/files/0008-qt-lib-infix.patch b/recipes/qt4/files/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..b1a443f24c --- /dev/null +++ b/recipes/qt4/files/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 |