diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-13 14:38:44 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-13 14:38:44 (GMT) |
| commit | 5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1 (patch) | |
| tree | 712cb1697a1f09439f77219c44ed90fb0223ff49 /src/gui/kernel/qwidget_wince.cpp | |
| parent | fdd2ad0813a856a00cac83ccff9bdd210b398c9c (diff) | |
| parent | 9820412d2551b655fec24ffde7b2a56e3ad168ea (diff) | |
| download | Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.zip Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.gz Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget_wince.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_wince.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp index cca928e..435fd31 100644 --- a/src/gui/kernel/qwidget_wince.cpp +++ b/src/gui/kernel/qwidget_wince.cpp @@ -535,7 +535,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate) if (newstate & Qt::WindowFullScreen) { if (d->topData()->normalGeometry.width() < 0 && !(oldstate & Qt::WindowMaximized)) d->topData()->normalGeometry = geometry(); - d->topData()->savedFlags = GetWindowLongA(internalWinId(), GWL_STYLE); + d->topData()->savedFlags = (Qt::WindowFlags) GetWindowLongA(internalWinId(), GWL_STYLE); UINT style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP; if (isVisible()) style |= WS_VISIBLE; @@ -598,13 +598,6 @@ void QWidget::setWindowState(Qt::WindowStates newstate) QApplication::sendEvent(this, &e); } - -void QWidgetPrivate::createSysExtra() { -#ifndef QT_NO_DRAGANDDROP - extra->dropTarget = 0; -#endif -} - void QWidgetPrivate::deleteSysExtra() { Q_Q(QWidget); |