diff options
| author | axis <qt-info@nokia.com> | 2009-10-30 12:35:59 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-30 12:35:59 (GMT) |
| commit | 8ab6921d227d1a89cc41d07af3f1a1a5b1304024 (patch) | |
| tree | ce334acef4af23c81a7b24d28c8ad47237d4e002 /src/gui/dialogs | |
| parent | 4e60cdcf222f607ccc49138035fb3d17140fee51 (diff) | |
| parent | 7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362 (diff) | |
| download | Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.zip Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.tar.gz Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qprintdialog_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/gui/dialogs/qprintdialog_win.cpp index 843c4e2..51e83ac 100644 --- a/src/gui/dialogs/qprintdialog_win.cpp +++ b/src/gui/dialogs/qprintdialog_win.cpp @@ -139,7 +139,7 @@ static void qt_win_setup_PRINTDLGEX(PRINTDLGEX *pd, QWidget *parent, if (d->ep->printToFile) pd->Flags |= PD_PRINTTOFILE; Q_ASSERT(parent != 0 && parent->testAttribute(Qt::WA_WState_Created)); - pd->hwndOwner = parent->winId(); + pd->hwndOwner = parent->window()->winId(); pd->lpPageRanges[0].nFromPage = qMax(pdlg->fromPage(), pdlg->minPage()); pd->lpPageRanges[0].nToPage = (pdlg->toPage() > 0) ? qMin(pdlg->toPage(), pdlg->maxPage()) : 1; pd->nCopies = d->ep->num_copies; |