Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

8 files changed, 39 insertions, 18 deletions

diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
index 6e4469e387..e387a58607 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#ifndef QT_NO_PRINTDIALOG
+
 #include <Cocoa/Cocoa.h>
 
 #include "qpagesetupdialog.h"
@@ -47,8 +49,6 @@
 #include <QtGui/qplatformnativeinterface_qpa.h>
 #include <QtPrintSupport/qprintengine.h>
 
-#ifndef QT_NO_PRINTDIALOG
-
 QT_USE_NAMESPACE
 
 @class QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate);
@@ -155,11 +155,15 @@ void QPageSetupDialogPrivate::closeCocoaPageLayout()
 
 QPageSetupDialog::QPageSetupDialog(QPrinter *printer, QWidget *parent)
     : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), printer, parent)
-{ }
+{
+    setAttribute(Qt::WA_DontShowOnScreen);
+}
 
 QPageSetupDialog::QPageSetupDialog(QWidget *parent)
     : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), 0, parent)
-{ }
+{
+    setAttribute(Qt::WA_DontShowOnScreen);
+}
 
 void QPageSetupDialog::setVisible(bool visible)
 {
@@ -172,6 +176,8 @@ void QPageSetupDialog::setVisible(bool visible)
     if (!visible == !isCurrentlyVisible)
         return;
 
+    QDialog::setVisible(visible);
+
     if (visible) {
         d->openCocoaPageLayout(parentWidget() ? Qt::WindowModal
                                               : Qt::ApplicationModal);
@@ -191,10 +197,15 @@ int QPageSetupDialog::exec()
     if (d->printer->outputFormat() != QPrinter::NativeFormat)
         return Rejected;
 
+    QDialog::setVisible(true);
+
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     d->openCocoaPageLayout(Qt::ApplicationModal);
     d->closeCocoaPageLayout();
     [pool release];
+
+    QDialog::setVisible(false);
+
     return result();
 }
 
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
index beaea96dd9..9d7387edba 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp
@@ -58,11 +58,13 @@ class QPageSetupDialogPrivate : public QAbstractPageSetupDialogPrivate
 QPageSetupDialog::QPageSetupDialog(QPrinter *printer, QWidget *parent)
     : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), printer, parent)
 {
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPageSetupDialog::QPageSetupDialog(QWidget *parent)
     : QAbstractPageSetupDialog(*(new QPageSetupDialogPrivate), 0, parent)
 {
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 int QPageSetupDialog::exec()
@@ -124,7 +126,9 @@ int QPageSetupDialog::exec()
     psd.rtMargin.right  = marginRect.width()  / multiplier;;
     psd.rtMargin.bottom = marginRect.height() / multiplier;;
 
+    QDialog::setVisible(true);
     bool result = PageSetupDlg(&psd);
+    QDialog::setVisible(false);
     if (result) {
         ep->readDevnames(psd.hDevNames);
         ep->readDevmode(psd.hDevMode);
diff --git a/src/printsupport/dialogs/qprintdialog.qrc b/src/printsupport/dialogs/qprintdialog.qrc
index f54eb6b5ee..5a579baa55 100644
--- a/src/printsupport/dialogs/qprintdialog.qrc
+++ b/src/printsupport/dialogs/qprintdialog.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/trolltech/dialogs/qprintpreviewdialog">
+<qresource prefix="/qt-project.org/dialogs/qprintpreviewdialog">
 <file>images/fit-page-24.png</file>
 <file>images/fit-page-32.png</file>
 <file>images/fit-width-24.png</file>
@@ -31,7 +31,7 @@
 <file>images/zoom-out-24.png</file>
 <file>images/zoom-out-32.png</file>
 </qresource>
-<qresource prefix="/trolltech/dialogs/qprintdialog">
+<qresource prefix="/qt-project.org/dialogs/qprintdialog">
 <file>images/status-color.png</file>
 <file>images/status-gray-scale.png</file>
 </qresource>
diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm
index ecd1ef60cd..8ea3c9a11d 100644
--- a/src/printsupport/dialogs/qprintdialog_mac.mm
+++ b/src/printsupport/dialogs/qprintdialog_mac.mm
@@ -243,6 +243,7 @@ QPrintDialog::QPrintDialog(QPrinter *printer, QWidget *parent)
     Q_D(QPrintDialog);
     if (!warnIfNotNative(d->printer))
         return;
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::QPrintDialog(QWidget *parent)
@@ -251,6 +252,7 @@ QPrintDialog::QPrintDialog(QWidget *parent)
     Q_D(QPrintDialog);
     if (!warnIfNotNative(d->printer))
         return;
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::~QPrintDialog()
@@ -263,10 +265,15 @@ int QPrintDialog::exec()
     if (!warnIfNotNative(d->printer))
         return QDialog::Rejected;
 
+    QDialog::setVisible(true);
+
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     d->openCocoaPrintPanel(Qt::ApplicationModal);
     d->closeCocoaPrintPanel();
     [pool release];
+
+    QDialog::setVisible(false);
+
     return result();
 }
 
@@ -286,6 +293,8 @@ void QPrintDialog::setVisible(bool visible)
     if (d->printer->outputFormat() != QPrinter::NativeFormat)
         return;
 
+    QDialog::setVisible(visible);
+
     if (visible) {
         d->openCocoaPrintPanel(parentWidget() ? Qt::WindowModal
                                               : Qt::ApplicationModal);
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 5c5ca77a72..75c9664d1d 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -178,7 +178,6 @@ private:
     const ppd_file_t* cupsPPD;
 #endif
 };
-#endif
 
 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
 class QOptionTreeItem
@@ -386,9 +385,9 @@ void QPrintDialogPrivate::init()
     bottom = new QWidget(q);
     options.setupUi(bottom);
     options.color->setIconSize(QSize(32, 32));
-    options.color->setIcon(QIcon(QLatin1String(":/trolltech/dialogs/qprintdialog/images/status-color.png")));
+    options.color->setIcon(QIcon(QLatin1String(":/qt-project.org/dialogs/qprintdialog/images/status-color.png")));
     options.grayscale->setIconSize(QSize(32, 32));
-    options.grayscale->setIcon(QIcon(QLatin1String(":/trolltech/dialogs/qprintdialog/images/status-gray-scale.png")));
+    options.grayscale->setIcon(QIcon(QLatin1String(":/qt-project.org/dialogs/qprintdialog/images/status-gray-scale.png")));
     top->d->setOptionsPane(this);
 
     buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, q);
@@ -1245,7 +1244,8 @@ void QPPDOptionsEditor::cbChanged(int)
 */
 }
 
-#endif
+#endif // !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#endif // defined (Q_OS_UNIX)
 
 QT_END_NAMESPACE
 
diff --git a/src/printsupport/dialogs/qprintdialog_win.cpp b/src/printsupport/dialogs/qprintdialog_win.cpp
index cc36e5eb8e..5474643de9 100644
--- a/src/printsupport/dialogs/qprintdialog_win.cpp
+++ b/src/printsupport/dialogs/qprintdialog_win.cpp
@@ -193,6 +193,7 @@ QPrintDialog::QPrintDialog(QPrinter *printer, QWidget *parent)
     if (!warnIfNotNative(d->printer))
         return;
     d->ep = static_cast<QWin32PrintEngine *>(d->printer->paintEngine())->d_func();
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::QPrintDialog(QWidget *parent)
@@ -202,6 +203,7 @@ QPrintDialog::QPrintDialog(QWidget *parent)
     if (!warnIfNotNative(d->printer))
         return;
     d->ep = static_cast<QWin32PrintEngine *>(d->printer->paintEngine())->d_func();
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::~QPrintDialog()
@@ -230,10 +232,7 @@ int QPrintDialogPrivate::openWindowsPrintDialogModally()
     if (parent == 0)
         parent = q;
 
-    QWidget modal_widget;
-    modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true);
-    modal_widget.setParent(parent, Qt::Window);
-    QApplicationPrivate::enterModal(&modal_widget);
+    q->QDialog::setVisible(true);
 
     HGLOBAL *tempDevNames = ep->createDevNames();
 
@@ -274,7 +273,7 @@ int QPrintDialogPrivate::openWindowsPrintDialogModally()
         }
     } while (!done);
 
-    QApplicationPrivate::leaveModal(&modal_widget);
+    q->QDialog::setVisible(false);
 
 //    qt_win_eatMouseMove();
 
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index ce2362b4fe..6864b24bac 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -341,7 +341,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
 
 static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name)
 {
-    QLatin1String imagePrefix(":/trolltech/dialogs/qprintpreviewdialog/images/");
+    QLatin1String imagePrefix(":/qt-project.org/dialogs/qprintpreviewdialog/images/");
     QIcon icon;
     icon.addFile(imagePrefix + name + QLatin1String("-24.png"), QSize(24, 24));
     icon.addFile(imagePrefix + name + QLatin1String("-32.png"), QSize(32, 32));
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index 28277f93d7..18d0fcee1d 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
@@ -93,8 +93,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_pageSetup())
     Q_PRIVATE_SLOT(d_func(), void _q_previewChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_zoomFactorChanged())
-
-    void *dummy; // ### Qt 5 - remove me
 };