diff options
author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-24 08:43:51 +0200 |
---|---|---|
committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-24 08:43:51 +0200 |
commit | f5daa62a4430164c4f9f7c34e8d7c53e37af8875 (patch) | |
tree | ed48df478ce5534a471c4583aae5e0909583b992 /recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch | |
parent | 9d54794e4edd80519e7c0ea47c0b107ab648c94f (diff) | |
download | openembedded-f5daa62a4430164c4f9f7c34e8d7c53e37af8875.tar.gz |
qt4: update from 4.5.0 to 4.5.1
Diffstat (limited to 'recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch')
-rw-r--r-- | recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..3efaff37d3 --- /dev/null +++ b/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch @@ -0,0 +1,34 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.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 + +Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -39,3 +39,4 @@ + QMAKE_PKGCONFIG_REQUIRES += QtXml + } + ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |