diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 15:15:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 15:15:20 (GMT) |
| commit | 22d51c69c85e6ac928b262668c3103eb63094ac8 (patch) | |
| tree | a4bfb22db384dd823df4999bcac620238fc53def /mkspecs | |
| parent | 669ae060863bf180590f3793a0217c9009de0e80 (diff) | |
| parent | 73d6632feb9b20fa37949a3f5b66ae30c5561eeb (diff) | |
| download | Qt-22d51c69c85e6ac928b262668c3103eb63094ac8.zip Qt-22d51c69c85e6ac928b262668c3103eb63094ac8.tar.gz Qt-22d51c69c85e6ac928b262668c3103eb63094ac8.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (124 commits)
Updated DEF files
opengl2: Make maximum cached glyph size configurable
QWS: fix the software/hardware cursor switcher
Fix horizontal centered text drawing without word wrap
Remove Font Smoothing hack for OS X
Revert "Fixed underline offset after raster coordinate system change."
Fix the painting for widgets painting directly on screen.
Unix configure: Add support for --sysroot
Add a 'capabilities' flag to the marshaller and demarshaller
Add a set of connection capabilities to QDBusConnection
Move the main D-Bus session and system connections to the main thread
Add a way to obtain the DBusConnection* pointer from a QDBusConnection
Make the QIconvCodec on Unix not enforce the Latin1 codec.
Fixed bad merges in GL windowsurface and get rid of redundant variable.
Added WindowSurfaceFeature enum to QWindowSurface.
Added preserved contents property to QWindowSurface.
Fixed underline offset after raster coordinate system change.
Designer: Fix tab order in action editor dialog.
Fix crash and infinite recursion caused by previous commits
tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/uitools.prf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index d9f6279..74acc64 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -93,7 +93,7 @@ contains(QMAKE_HOST.os,Windows) { QMAKE_COPY = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i QMAKE_MOVE = move - QMAKE_DEL_FILE = del 2> NUL + QMAKE_DEL_FILE = del /q 2> NUL QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir QMAKE_DEL_TREE = rmdir /s /q 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 |