diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-03-25 14:43:21 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:24:54 (GMT) |
| commit | e4b978f5745f8a05da93b5627be5557751fec773 (patch) | |
| tree | 9d36915060bd6a72111398329ac0986fbb2227df | |
| parent | 1f9af6e135db4b0fa26ab7bac69a6c63ff083e59 (diff) | |
| download | Qt-e4b978f5745f8a05da93b5627be5557751fec773.zip Qt-e4b978f5745f8a05da93b5627be5557751fec773.tar.gz Qt-e4b978f5745f8a05da93b5627be5557751fec773.tar.bz2 | |
Make QtUiTools use the lib-infix passed to configure.
Patch contributed by OpenEmbedded project.
Reviewed-by: hjk
Task-number: QTBUG-7169
| -rw-r--r-- | mkspecs/features/uitools.prf | 6 | ||||
| -rw-r--r-- | tools/designer/src/uitools/uitools.pro | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf index 2d14b04..6599577 100644 --- a/mkspecs/features/uitools.prf +++ b/mkspecs/features/uitools.prf @@ -3,11 +3,11 @@ qt:load(qt) # 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 diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro index 7b94587..66f35c6 100644 --- a/tools/designer/src/uitools/uitools.pro +++ b/tools/designer/src/uitools/uitools.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -TARGET = $$qtLibraryTarget(QtUiTools) +TARGET = QtUiTools QT += xml CONFIG += qt staticlib DESTDIR = ../../../../lib @@ -43,3 +43,5 @@ unix { QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_REQUIRES += QtXml } + +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end |