diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 18:07:04 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 18:07:04 +1000 |
| commit | 4da2ba2e788bb63a155e1d10ae559d4366eed875 (patch) | |
| tree | 8ab88bdb3e59fa5ca6eab5ce8ab03445b138c591 /mkspecs | |
| parent | aee4087d62900624822ea820b1eb8e2d960d0869 (diff) | |
| parent | 48e91e6beb3cefbc15e583dcdb6005a7d9278104 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Designer: Fix tab order in action editor dialog.
Make QtUiTools use the lib-infix passed to configure.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uitools.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf index 2d14b04d97..65995770de 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 |