42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11
|
|
|
|
Patch has been accepted upstream and should be included in the next major version (4.8.0), see:
|
|
http://bugreports.qt.nokia.com/browse/QTBUG-7169
|
|
|
|
Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
|
|
Ported from OE by: Yu Ke <ke.yu@intel.com>
|
|
Upstream-Status: Accepted
|
|
|
|
--- /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
|