diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-08 00:16:22 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-08 00:16:22 +0400 |
| commit | 1fc42f78167d44d0e26d09a431e26bb1313dde9a (patch) | |
| tree | 13c927e18d4c5134f81b104e04e43d776c90fdb2 /recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch | |
| parent | eaee46b83cf415bb60bbc59b71a4632478b5e48a (diff) | |
| parent | f3d6071476b37720b561fed60b540c4f3a10a865 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch')
| -rw-r--r-- | recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.5.2/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..3efaff37d3 --- /dev/null +++ b/recipes/qt4/qt4-embedded-4.5.2/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 |