diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-17 21:41:22 +0100 |
commit | c58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch) | |
tree | 3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch | |
parent | eec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff) | |
download | meta-openembedded-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz |
move layer into meta-oe in preparation for future splits
As per TSC decision
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch')
-rw-r--r-- | recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch b/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch deleted file mode 100644 index 61e60a0eb6..0000000000 --- a/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | --- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 | ||
2 | +++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 | ||
3 | @@ -3,11 +3,11 @@ | ||
4 | |||
5 | # Include the correct version of the UiLoader library | ||
6 | symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib | ||
7 | -else: QTUITOOLS_LINKAGE = -lQtUiTools | ||
8 | +else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} | ||
9 | |||
10 | CONFIG(debug, debug|release) { | ||
11 | - mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug | ||
12 | - win32: QTUITOOLS_LINKAGE = -lQtUiToolsd | ||
13 | + mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug | ||
14 | + win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d | ||
15 | } | ||
16 | LIBS += $$QTUITOOLS_LINKAGE | ||
17 | |||
18 | --- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 | ||
19 | +++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 | ||
20 | @@ -1,5 +1,5 @@ | ||
21 | TEMPLATE = lib | ||
22 | -TARGET = $$qtLibraryTarget(QtUiTools) | ||
23 | +TARGET = QtUiTools | ||
24 | QT += xml | ||
25 | CONFIG += qt staticlib | ||
26 | DESTDIR = ../../../../lib | ||
27 | @@ -43,3 +43,5 @@ | ||
28 | QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
29 | QMAKE_PKGCONFIG_REQUIRES += QtXml | ||
30 | } | ||
31 | + | ||
32 | +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end | ||