summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-04-08 07:19:37 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-04-08 07:19:37 (GMT)
commitc9726dbdcc2defa42ae97fecfd06a5db96890424 (patch)
treef48598b6de3cd9f1b26c7a467f4cf56f36dab3a9 /src/gui
parent2213f812acb023f7f52d930c30c0ea7a170629bf (diff)
parenta41345b6a6f2ed6e8c1a3442aba8259bb87f9fed (diff)
downloadQt-c9726dbdcc2defa42ae97fecfd06a5db96890424.zip
Qt-c9726dbdcc2defa42ae97fecfd06a5db96890424.tar.gz
Qt-c9726dbdcc2defa42ae97fecfd06a5db96890424.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index a8680b9..f80b657 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1448,8 +1448,10 @@ void QSymbianControl::HandleResourceChange(int resourceType)
{
handleClientAreaChange();
// Send resize event to trigger desktopwidget workAreaResized signal
- QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
- QApplication::sendEvent(qt_desktopWidget, &e);
+ if (qt_desktopWidget) {
+ QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
+ QApplication::sendEvent(qt_desktopWidget, &e);
+ }
break;
}
#endif