diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-18 22:40:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-18 22:40:15 (GMT) |
| commit | 9bee0352ad9d9037c914c517486fe40f497f288a (patch) | |
| tree | 8c6bb66047fe22c16f16131b859a79535e186667 | |
| parent | 01cd9579af3b0c3546b7b8a7d9e2bd37bd2e327b (diff) | |
| parent | 521df9e30df41b49da7d856c833946417ec4856b (diff) | |
| download | Qt-9bee0352ad9d9037c914c517486fe40f497f288a.zip Qt-9bee0352ad9d9037c914c517486fe40f497f288a.tar.gz Qt-9bee0352ad9d9037c914c517486fe40f497f288a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Prepend epocroot to extra target tools if they start with /epoc32/
QS60Style: ComboBox disappears after orientation switch
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm | 4 | ||||
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm index 1338515..2dc4028 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm @@ -12,6 +12,10 @@ SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET)) $(call makepathfor,$(PREDEP_TARGET)) +ifeq ($(patsubst /epoc32/%,MATCH,$(firstword $(COMMAND))),MATCH) +COMMAND:=$(EPOCROOT)$(COMMAND) +endif + define qmake_extra_pre_targetdep EXPORT:: $(PREDEP_TARGET) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 1e32bd8..50e8a5b 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2620,6 +2620,8 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget); break; } + if (!sz.isValid()) + sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget); return sz; } |