diff options
author | Oliver Wolff <oliver.wolff@nokia.com> | 2011-10-24 09:25:32 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 15:55:10 +0200 |
commit | 318a274381c441b13ce67517cad3fd74985c73a8 (patch) | |
tree | 3b845a73ea431267f565a4d4a88b5aeb16ff9672 /src/printsupport/dialogs/qpagesetupdialog_win.cpp | |
parent | 54c132480b171518328f39bcf3f0faf0ea50ef0b (diff) |
Readded PrintSupport for Windows
The prepared plugin architecture for
printing support was used as much as
possible but some functionality had to
be done in src/printsupport.
Change-Id: Ic8446cb8018a0970b4da97c1912ba6dc20d2a09f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/printsupport/dialogs/qpagesetupdialog_win.cpp')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 2e7cf860fc..d21bbb1a36 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -44,8 +44,10 @@ #ifndef QT_NO_PRINTDIALOG #include <qapplication.h> -#include <private/qprintengine_win_p.h> -#include <private/qabstractpagesetupdialog_p.h> +#include "../kernel/qprintengine_win_p.h" +#include "qabstractpagesetupdialog_p.h" +#include "qprinter.h" +#include <QtGui/qplatformnativeinterface_qpa.h> QT_BEGIN_NAMESPACE @@ -99,7 +101,9 @@ int QPageSetupDialog::exec() QWidget *parent = parentWidget(); parent = parent ? parent->window() : QApplication::activeWindow(); Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created)); - psd.hwndOwner = parent ? parent->winId() : 0; + + QWindow *parentWindow = parent->windowHandle(); + psd.hwndOwner = parentWindow ? (HWND)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", parentWindow) : 0; QRect paperRect = d->printer->paperRect(); QRect pageRect = d->printer->pageRect(); |