diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 14:06:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-15 15:53:16 +0000 |
| commit | f98d125b2928d0784d509c8025271fca661ea270 (patch) | |
| tree | 214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/printsupport | |
| parent | c09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff) | |
| parent | 605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index afe0268e55..8d6fdbd6de 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -94,7 +94,7 @@ int QPageSetupDialog::exec() parent = parent ? parent->window() : QApplication::activeWindow(); Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created)); - QWindow *parentWindow = parent->windowHandle(); + QWindow *parentWindow = parent ? parent->windowHandle() : 0; psd.hwndOwner = parentWindow ? (HWND)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", parentWindow) : 0; psd.Flags = PSD_MARGINS; |