[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-7-5-ge678a61

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e678a61

The following commit has been merged in the master branch:
commit e678a61ce2303ca15f8c96acad85911ce6ea8b2a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 23 16:06:13 2015 +0300

    Make uic generate correct include paths for QValidator-derived classes.
    
    Closes: #800375.
---
 debian/changelog                         |  3 +++
 debian/patches/series                    |  1 +
 debian/patches/uic_qvalidator_qtgui.diff | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59cbcfe..aae20a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.5.1+dfsg-9) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream patch to make uic generate correct include paths for
+    QValidator-derived classes (uic_qvalidator_qtgui.diff; closes: #800375).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Nov 2015 15:58:24 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index e1548df..cc6bae8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ mips_no_atomic.diff
 detect_64bit_atomic.diff
 qnetworkreply_abort_socket.diff
 qnetworkaccessmanager_accessibility.diff
+uic_qvalidator_qtgui.diff
 
 # Debian specific.
 gnukfreebsd.diff
diff --git a/debian/patches/uic_qvalidator_qtgui.diff b/debian/patches/uic_qvalidator_qtgui.diff
new file mode 100644
index 0000000..27d9bcf
--- /dev/null
+++ b/debian/patches/uic_qvalidator_qtgui.diff
@@ -0,0 +1,22 @@
+Description: uic: fix include path of QValidator-derived classes
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=a4df9739a2898f49
+Bug: https://bugs.debian.org/800375
+Last-Update: 2015-11-23
+
+--- a/src/tools/uic/qclass_lib_map.h
++++ b/src/tools/uic/qclass_lib_map.h
+@@ -969,10 +969,10 @@
+ QT_CLASS_LIB(QToolBar, QtWidgets, qtoolbar.h)
+ QT_CLASS_LIB(QToolBox, QtWidgets, qtoolbox.h)
+ QT_CLASS_LIB(QToolButton, QtWidgets, qtoolbutton.h)
+-QT_CLASS_LIB(QValidator, QtWidgets, qvalidator.h)
+-QT_CLASS_LIB(QIntValidator, QtWidgets, qvalidator.h)
+-QT_CLASS_LIB(QDoubleValidator, QtWidgets, qvalidator.h)
+-QT_CLASS_LIB(QRegExpValidator, QtWidgets, qvalidator.h)
++QT_CLASS_LIB(QValidator, QtGui, qvalidator.h)
++QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h)
++QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h)
++QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
+ QT_CLASS_LIB(QScriptEngineDebugger, QtScriptTools, qscriptenginedebugger.h)
+ QT_CLASS_LIB(QDesignerComponents, QtDesigner, qdesigner_components.h)
+ QT_CLASS_LIB(QExtensionFactory, QtDesigner, default_extensionfactory.h)

-- 
qtbase packaging