diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-02-16 10:47:02 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-02-17 09:43:47 +0100 |
| commit | fba63ed00f92f939529bd1fd1f47a8d715f8bea8 (patch) | |
| tree | 113450dc1c92b51d66e0e8c391476ebefbb90ade /recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch | |
| parent | 7194635729b20c15d41a08c89a30a5a8aabbc090 (diff) | |
qt4: add 4.6.2
* fix 4.6.1 references in 4.6.0 files as well
* make qt-config.patch work with QT_NO_CAST_{TO,FROM},ASCII strict checking
Diffstat (limited to 'recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch')
| -rw-r--r-- | recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..61e60a0eb6 --- /dev/null +++ b/recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch @@ -0,0 +1,32 @@ +--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 +@@ -3,11 +3,11 @@ + + # Include the correct version of the UiLoader library + symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib +-else: QTUITOOLS_LINKAGE = -lQtUiTools ++else: 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 + +--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -43,3 +43,5 @@ + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_REQUIRES += QtXml + } ++ ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |