Add support for Qt 5.9

Origin: upstream, from 5.8 and 5.9 releases
Patch-Name: qt59_support.diff

Gbp-Pq: Name qt59_support.diff

diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
index 94601426667fc96b695ca45a43aecf7a7ea314ca..e0c247a3b19e35d0ce0e0c818ee67dab05247952 100644 (file)
--- a/sip/QtCore/QtCoremod.sip
+++ b/sip/QtCore/QtCoremod.sip
@@ -22,7 +22,7 @@
 
 %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
 
-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1}
 
 %Platforms {WS_X11 WS_WIN WS_MACX}
 

diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
index 2db83b7c6788849f301d95d45ec189a5bbe70d63..559f4101b9e6731adc242763d0f8797f223dd743 100644 (file)
--- a/sip/QtCore/qnamespace.sip
+++ b/sip/QtCore/qnamespace.sip
@@ -209,8 +209,6 @@ namespace Qt
         WindowContextHelpButtonHint,
         WindowShadeButtonHint,
         WindowStaysOnTopHint,
-        WindowOkButtonHint,
-        WindowCancelButtonHint,
         WindowStaysOnBottomHint,
         WindowCloseButtonHint,
         MacWindowToolBarButtonHint,

diff --git a/sip/QtCore/qobject.sip b/sip/QtCore/qobject.sip
index d4e024777dc12ad3e97d17763c1101a519f48aca..2d77ed76552bb049035874170a440eee30f3e971 100644 (file)
--- a/sip/QtCore/qobject.sip
+++ b/sip/QtCore/qobject.sip
@@ -527,8 +527,8 @@ callable.
     void setParent(QObject * /TransferThis/);
     void installEventFilter(QObject *);
     void removeEventFilter(QObject *);
-    void dumpObjectInfo();
-    void dumpObjectTree();
+    void dumpObjectInfo() const;
+    void dumpObjectTree() const;
     QList<QByteArray> dynamicPropertyNames() const;
     bool setProperty(const char *name, const QVariant &value);
     QVariant property(const char *name) const;

diff --git a/sip/QtQml/qqmlapplicationengine.sip b/sip/QtQml/qqmlapplicationengine.sip
index 529a37092ebd1f931932d6da9307e25d0168ea60..a84597417c36233e378197f4deeb0a946e95e8ef 100644 (file)
--- a/sip/QtQml/qqmlapplicationengine.sip
+++ b/sip/QtQml/qqmlapplicationengine.sip
@@ -33,7 +33,7 @@ public:
     QQmlApplicationEngine(const QUrl &url, QObject *parent /TransferThis/ = 0);
     QQmlApplicationEngine(const QString &filePath, QObject *parent /TransferThis/ = 0);
     virtual ~QQmlApplicationEngine();
-    QList<QObject *> rootObjects();
+    QList<QObject *> rootObjects() const;
 
 public slots:
     void load(const QUrl &url) /ReleaseGIL/;

diff --git a/sip/QtQuick/qquickitemgrabresult.sip b/sip/QtQuick/qquickitemgrabresult.sip
index 15ac42e08806613cfd4c96f51a047996272c827e..6c27075c3f6f4d982e1ce0b1668b451797771e45 100644 (file)
--- a/sip/QtQuick/qquickitemgrabresult.sip
+++ b/sip/QtQuick/qquickitemgrabresult.sip
@@ -31,7 +31,7 @@ class QQuickItemGrabResult : QObject
 public:
     QImage image() const;
     QUrl url() const;
-    bool saveToFile(const QString &fileName);
+    bool saveToFile(const QString &fileName) const;
 
 protected:
     virtual bool event(QEvent *);

diff --git a/sip/QtSql/qsql.sip b/sip/QtSql/qsql.sip
index f7d3e449aabce696ae19061685d8a498a0d969fe..758362f144dde3bd64362b6e8358c708ec645818 100644 (file)
--- a/sip/QtSql/qsql.sip
+++ b/sip/QtSql/qsql.sip
@@ -23,7 +23,7 @@
 namespace QSql
 {
 %TypeHeaderCode
-#include <qsql.h>
+#include <qtsqlglobal.h>
 %End
 
     enum Location