diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-15 17:40:34 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-15 17:40:34 (GMT) |
| commit | 5bfdd295496e412ccb5777adb58eec847e8b51ba (patch) | |
| tree | c69f10b6c08e8fd1b30ad65db5c9f16035ca9276 | |
| parent | 82e19a10f13005a327b134999315ecf39d5d70e3 (diff) | |
| parent | 12b4262f1f6e5d7560c0495096e86668cdf69cad (diff) | |
| download | Qt-5bfdd295496e412ccb5777adb58eec847e8b51ba.zip Qt-5bfdd295496e412ccb5777adb58eec847e8b51ba.tar.gz Qt-5bfdd295496e412ccb5777adb58eec847e8b51ba.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 | ||||
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 663a1df..7b78033 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -62,8 +62,8 @@ QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script -QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lplatformenv -lcommonui -letext -lapmime -QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl +QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lsendui -lplatformenv -lcommonui -letext -lapmime +QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 1292092..29827b7 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -559,7 +559,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, QRect endRect; if (orientation == Qt::Horizontal) { - startRect.setWidth(qMin(rect.width() >>1 - 1, startRect.width())); + startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width())); endRect = startRect.translated(rect.width() - startRect.width(), 0); middleRect.adjust(startRect.width(), 0, -startRect.width(), 0); if (startRect.bottomRight().x() > endRect.topLeft().x()) { @@ -568,7 +568,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, endRect.adjust(overlap,0,0,0); } } else { - startRect.setHeight(qMin(rect.height() >>1 - 1, startRect.height())); + startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height())); endRect = startRect.translated(0, rect.height() - startRect.height()); middleRect.adjust(0, startRect.height(), 0, -startRect.height()); if (startRect.topRight().y() > endRect.bottomLeft().y()) { |