From 44af54419eaceb27bb729717d6363917fd6bb819 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 23 Nov 2016 12:25:17 +0100
Subject: Properly use the "process" feature

Replace all QT_NO_PROCESS with QT_CONFIG(process), define it in
qconfig-bootstrapped.h, add QT_REQUIRE_CONFIG(process) to the qprocess
headers, exclude the sources from compilation when switched off, guard
header inclusions in places where compilation without QProcess seems
supported, drop some unused includes, and fix some tests that were
apparently designed to work with QT_NO_PROCESS but failed to.

Change-Id: Ieceea2504dea6fdf43b81c7c6b65c547b01b9714
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/styles/qfusionstyle.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/widgets/styles')

diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index e08cd3ac70..7cfb51743d 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -51,7 +51,6 @@
 #include <qmainwindow.h>
 #include <qfont.h>
 #include <qgroupbox.h>
-#include <qprocess.h>
 #include <qpixmapcache.h>
 #include <qdialogbuttonbox.h>
 #include <qscrollbar.h>
-- 
cgit v1.2.3


From d46afc24c177642734ed7a228fc6d3a0d7fa429f Mon Sep 17 00:00:00 2001
From: Oleg Yadrov <oleg.yadrov@qt.io>
Date: Wed, 22 Feb 2017 12:49:49 -0800
Subject: QMacStyle::sizeFromContents(CT_Menu): take proxy style into account

This is missed in 10d0f4cba99d2386db28a3afd71832e35992b797

Change-Id: If3566eb4b1f00f6882c290c83e10e51e1bf1d6d9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
---
 src/widgets/styles/qmacstyle_mac.mm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/widgets/styles')

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 238e96ab4f..f23f6c00b2 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -6759,7 +6759,15 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
         break;
     }
     case CT_Menu: {
-        sz = csz;
+        if (proxy() == this) {
+            sz = csz;
+        } else {
+            QStyleHintReturnMask menuMask;
+            QStyleOption myOption = *opt;
+            myOption.rect.setSize(sz);
+            if (proxy()->styleHint(SH_Menu_Mask, &myOption, widget, &menuMask))
+                sz = menuMask.region.boundingRect().size();
+        }
         break; }
     case CT_HeaderSection:{
         const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(opt);
-- 
cgit v1.2.3


From d6330a19b29ebff359a6746250c78437dbcaf77d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Dec 2016 10:34:32 +0100
Subject: Use QT_CONFIG(library) instead of QT_NO_LIBRARY

For the windows file system engine, we add an extra macro to use
library loading if configured to do so, but avoid it on WinRT, as
none of the symbols would be found.

We also QT_REQUIRE_CONFIG(library) in the library headers and
exclude the sources from the build if library loading is disabled.
This, in turn, makes it necessary to clean up some header inclusions.

Change-Id: I2b152cb5b47a2658996b6f4702b038536a5704ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/styles/qfusionstyle.cpp         | 1 -
 src/widgets/styles/qmacstyle_mac_p_p.h      | 1 -
 src/widgets/styles/qwindowsvistastyle_p_p.h | 1 -
 3 files changed, 3 deletions(-)

(limited to 'src/widgets/styles')

diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 7cfb51743d..f1cd48556c 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -59,7 +59,6 @@
 #include <qsplitter.h>
 #include <qprogressbar.h>
 #include <qwizard.h>
-#include <qlibrary.h>
 #include <qdrawutil.h>
 #include <private/qstylehelper_p.h>
 #include <private/qdrawhelper_p.h>
diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h
index 798f6ed90b..601dd643fb 100644
--- a/src/widgets/styles/qmacstyle_mac_p_p.h
+++ b/src/widgets/styles/qmacstyle_mac_p_p.h
@@ -89,7 +89,6 @@
 #include <qtableview.h>
 #include <qwizard.h>
 #include <qdebug.h>
-#include <qlibrary.h>
 #include <qdatetimeedit.h>
 #include <qmath.h>
 #include <qpair.h>
diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h
index 18b6f9c3f7..e12203f0a9 100644
--- a/src/widgets/styles/qwindowsvistastyle_p_p.h
+++ b/src/widgets/styles/qwindowsvistastyle_p_p.h
@@ -58,7 +58,6 @@
 #include <private/qwindowsxpstyle_p_p.h>
 #include <private/qstyleanimation_p.h>
 #include <private/qpaintengine_raster_p.h>
-#include <qlibrary.h>
 #include <qpaintengine.h>
 #include <qwidget.h>
 #include <qapplication.h>
-- 
cgit v1.2.3