From a5174c7483560eed60fe000c74a984c561568ac6 Mon Sep 17 00:00:00 2001
From: Jay Nabonne <jay.nabonne@geoteric.com>
Date: Mon, 21 Jan 2019 13:49:02 +0000
Subject: [PATCH] Don't use desktop in wxQtMeasuringContext

This doesn't work, so create a new QPainter instead.
---
 src/qt/graphics.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp
index 97feabff96..4d2c351071 100644
--- a/src/qt/graphics.cpp
+++ b/src/qt/graphics.cpp
@@ -654,6 +654,13 @@ public:
 
 #endif
 
+    wxQtGraphicsContext(wxGraphicsRenderer* renderer, QPainter* painter, bool ownsPainter = true)
+        : wxGraphicsContext(renderer),
+          m_qtPainter(painter),
+          m_ownsPainter(ownsPainter)
+    {
+    }
+
     wxQtGraphicsContext(wxGraphicsRenderer* renderer, wxWindow *window)
         : wxGraphicsContext(renderer)
     {
@@ -1020,12 +1027,9 @@ class wxQtMeasuringContext : public wxQtGraphicsContext
 {
 public:
     wxQtMeasuringContext(wxGraphicsRenderer* renderer)
-        : wxQtGraphicsContext(renderer, QApplication::desktop())
+        : wxQtGraphicsContext(renderer, new QPainter())
     {
     }
-
-private:
-    QPainter painter;
 };
 
 class wxQtImageContext : public wxQtGraphicsContext