diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 16:24:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 16:24:00 (GMT) |
| commit | 1c38e7c2107b7cb7ff997126ded3819d760a3191 (patch) | |
| tree | f4f378a1ddb6ffb5e4c48931ed4da0ff8e1fb2e8 /src/gui/kernel | |
| parent | c2f542ee646b8e4bd87e6078dc9c83b661229f41 (diff) | |
| parent | 05231f486b93dfb3992bfb96568f8c71d877e104 (diff) | |
| download | Qt-1c38e7c2107b7cb7ff997126ded3819d760a3191.zip Qt-1c38e7c2107b7cb7ff997126ded3819d760a3191.tar.gz Qt-1c38e7c2107b7cb7ff997126ded3819d760a3191.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:
Fix epocroot handling in createpackage.pl script
Make s60pixelmetrics harvester utility app more robust
Implemented Qt::WA_ShowWithoutActivating for Symbian.
Clean up ARM SIMD drawhelper code and make sure it works.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 9a451ce..5df5e19 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -544,7 +544,7 @@ void QWidgetPrivate::show_sys() id->MakeVisible(true); - if(q->isWindow()) + if(q->isWindow()&&!q->testAttribute(Qt::WA_ShowWithoutActivating)) id->setFocusSafely(true); } |