equal
deleted
inserted
replaced
278 releaseKeyboard(); |
278 releaseKeyboard(); |
279 if (testAttribute(Qt::WA_ShowModal)) // just be sure we leave modal |
279 if (testAttribute(Qt::WA_ShowModal)) // just be sure we leave modal |
280 QApplicationPrivate::leaveModal(this); |
280 QApplicationPrivate::leaveModal(this); |
281 else if ((windowType() == Qt::Popup)) |
281 else if ((windowType() == Qt::Popup)) |
282 qApp->d_func()->closePopup(this); |
282 qApp->d_func()->closePopup(this); |
283 |
283 #ifndef QT_NO_IM |
284 if (d->ic) { |
284 if (d->ic) { |
285 delete d->ic; |
285 delete d->ic; |
286 d->ic =0; |
286 d->ic =0; |
287 } else { |
287 } else { |
288 // release previous focus information participating with |
288 // release previous focus information participating with |
289 // preedit preservation of qic -- while we still have a winId |
289 // preedit preservation of qic -- while we still have a winId |
290 QInputContext *qic = inputContext(); |
290 QInputContext *qic = inputContext(); |
291 if (qic) |
291 if (qic) |
292 qic->widgetDestroyed(this); |
292 qic->widgetDestroyed(this); |
293 } |
293 } |
|
294 #endif //QT_NO_IM |
294 |
295 |
295 if ((windowType() == Qt::Desktop)) { |
296 if ((windowType() == Qt::Desktop)) { |
296 } else { |
297 } else { |
297 if (parentWidget() && parentWidget()->testAttribute(Qt::WA_WState_Created)) { |
298 if (parentWidget() && parentWidget()->testAttribute(Qt::WA_WState_Created)) { |
298 d->hide_sys(); |
299 d->hide_sys(); |