diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-07-16 08:17:32 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-18 03:02:47 (GMT) |
| commit | 5cb7d124122c7b78a1149c2878f04773424f1d15 (patch) | |
| tree | c14a059f3e7c6b70e0533096e66ff9dfa2f4b636 /src | |
| parent | e0a590ed25627a7d8efc7f2e20e814394fd8418d (diff) | |
| download | Qt-5cb7d124122c7b78a1149c2878f04773424f1d15.zip Qt-5cb7d124122c7b78a1149c2878f04773424f1d15.tar.gz Qt-5cb7d124122c7b78a1149c2878f04773424f1d15.tar.bz2 | |
Windows mobile: show the [X] button in the taskbar when maximizing
We're now showing the cancel button explicitly in the taskbar on
maximize, if the widget does not have the widget flags
CancelButtonHint and OKButtonHint.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit 5f76c2b168ded91835d5d161b738a5dc03556cf6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguifunctions_wince.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp index f5004b0..ab1a655 100644 --- a/src/gui/kernel/qguifunctions_wince.cpp +++ b/src/gui/kernel/qguifunctions_wince.cpp @@ -323,6 +323,8 @@ void qt_wince_maximize(QWidget *widget) shidi.dwFlags |= SHIDIF_CANCELBUTTON; if (widget->windowFlags() & Qt::WindowOkButtonHint) shidi.dwFlags |= SHIDIF_DONEBUTTON; + if (!(widget->windowFlags() & (Qt::WindowCancelButtonHint | Qt::WindowOkButtonHint))) + shidi.dwFlags |= SHIDIF_CANCELBUTTON; resolveAygLibs(); if (ptrAygInitDialog) ptrAygInitDialog(&shidi); |