From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
Date: Thu, 8 Oct 2015 20:39:19 +0000 (-0700)
Subject: qt5_includes
X-Git-Tag: archive/raspbian/2.11.2+dfsg-6+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=92006234d5a7da5e94cd6167fdd3caede58031c6;p=qscintilla2.git

qt5_includes

When building for Qt5, the python extension needs QtWidgets and QtPrintSupport
because things moved there from QtGui in Qt4.  Sent upstream.

Patch-Name: qt5_includes.patch

Gbp-Pq: Name 0005-qt5_includes.patch
---

diff --git a/Python/configure.py b/Python/configure.py
index 04b8054..d2a5bc9 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -1612,6 +1612,9 @@ INSTALLS += sip
     if includepath:
         pro.write('INCLUDEPATH += %s\n' % includepath)
 
+    if target_config.pyqt_package == 'PyQt5':
+        pro.write('INCLUDEPATH += %s\n' % (target_config.qt_inc_dir + '/QtWidgets ' + target_config.qt_inc_dir + '/QtPrintSupport'))
+
     # Make sure the SIP include directory is searched before the Python include
     # directory if they are different.
     pro.write('INCLUDEPATH += %s\n' % quote(target_config.sip_inc_dir))