From 58af8685bbc2f23a62045b413e46ad7811e47c56 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Mon, 18 Oct 2010 13:37:36 +0300 Subject: QS60Style: ComboBox disappears after orientation switch This is due to that QS60Style uses desktop area for a bounding rect of combobox content to disallow it to grow outside of screen size. Unfortunately with some recent changes to screensize handling in desktop widget size makes the desktop resize to happen later than when style is asked for combobox size. So, style returns invalid QSize for combobox content size. As a fix, if the returned size is invalid, ask it directly from QCommonStyle. Task-number: QTBUG-14423 Reviewed-by: Janne Anttila --- src/gui/styles/qs60style.cpp | 2 ++ 1 file changed, 2 insertions(+) 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; } -- cgit v0.12 From 521df9e30df41b49da7d856c833946417ec4856b Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 18 Oct 2010 13:48:14 +0300 Subject: Prepend epocroot to extra target tools if they start with /epoc32/ This makes it possible to define extra targets and extra compilers commands that use tools under EPOCROOT without having to worry whether EPOCROOT contains drive letter or not, which is demanded by sbsv2 toolchain. For example, if command to be used is "%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted in .pro file and the command be given simply as "/epoc32/tools/foobar.exe". Reviewed-by: Janne Koskinen --- mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm | 4 ++++ 1 file changed, 4 insertions(+) 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) -- cgit v0.12