Reduce usage of QDesktopWidget to resolve screen properties in QtWidgets

Removes the need to initialize QDesktopWidget, just to look up which
screen a widget would map to, the geometry of a screen, number of
screens, etc.

Change-Id: Ieb153b9ff6d3fba645fc528d6e430e8392f990bf
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index c496d267b3..fd783da49a 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -44,6 +44,7 @@
 #include "qapplication.h"
 #include "qbitmap.h"
 #include "qdesktopwidget.h"
+#include <private/qdesktopwidget_p.h>
 #include "qevent.h"
 #include "qlayout.h"
 #include "qstackedwidget.h"
@@ -829,7 +830,7 @@ QSize QTabWidget::sizeHint() const
     if(usesScrollButtons())
         t = t.boundedTo(QSize(200,200));
     else
-        t = t.boundedTo(QApplication::desktop()->size());
+        t = t.boundedTo(QDesktopWidgetPrivate::size());
 
     QSize sz = basicSize(d->pos == North || d->pos == South, lc, rc, s, t);
 
@@ -897,7 +898,7 @@ int QTabWidget::heightForWidth(int width) const
     if(usesScrollButtons())
         t = t.boundedTo(QSize(200,200));
     else
-        t = t.boundedTo(QApplication::desktop()->size());
+        t = t.boundedTo(QDesktopWidgetPrivate::size());
 
     const bool tabIsHorizontal = (d->pos == North || d->pos == South);
     const int contentsWidth = width - padding.width();