[Python-modules-commits] [pyqt5] 01/01: New upstream version 5.9.2+dfsg
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Nov 25 12:18:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch upstream
in repository pyqt5.
commit f15b999b4fafee276d65a2ea579a893741ce1ae9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Nov 25 15:17:09 2017 +0300
New upstream version 5.9.2+dfsg
---
ChangeLog | 80 +++++++++++++++
NEWS | 4 +
configure.py | 112 +++++++++++----------
qpy/QtCore/qpycore_event_handlers.cpp | 9 +-
sip/QtAndroidExtras/QtAndroidExtrasmod.sip | 48 +++++++++
.../qandroidjniobject.sip} | 52 ++++------
.../qtandroid.sip} | 29 ++++--
sip/QtCore/QtCoremod.sip | 2 +-
sip/QtCore/qglobal.sip | 4 +-
sip/QtCore/qrunnable.sip | 2 +-
sip/QtCore/qurl.sip | 2 -
sip/QtMacExtras/qmacpasteboardmime.sip | 4 +
sip/QtMacExtras/qmactoolbar.sip | 4 +
sip/QtMacExtras/qmactoolbaritem.sip | 4 +
14 files changed, 251 insertions(+), 105 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eae6365..3f72665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,85 @@
+2017-11-23 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS:
+ Released as v5.9.2.
+ [7fac90c2d528] [5.9.2] <5.9-maint>
+
+ * PyQt5.msp:
+ Updated for Qt v5.9.3.
+ [5fffc2c72bd5] <5.9-maint>
+
+2017-11-21 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Added /NewThread/ to QRunnable::run().
+ [17c89f899276] <5.9-maint>
+
+2017-11-19 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qpy/QtCore/qpycore_event_handlers.cpp:
+ Ignore destroyed QObjects when there is no interpreter.
+ [276966407f1c] <5.9-maint>
+
+2017-11-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * QtAndroidExtras/qtandroid.sip:
+ Fixed the name of the QtAndroid header file.
+ [58b1a3f4108d] <5.9-maint>
+
+ * QtAndroidExtras/qtandroid.sip:
+ Fixed the name of the QtAndroid namespace.
+ [87890f4acfe5] <5.9-maint>
+
+2017-11-15 Phil Thompson <phil at riverbankcomputing.com>
+
+ * QtAndroidExtras/qtandroid.sip:
+ Added the missing QtAndroid .sip file.
+ [ee26f550ab15] <5.9-maint>
+
+ * QtMacExtras/qmacpasteboardmime.sip, QtMacExtras/qmactoolbar.sip,
+ QtMacExtras/qmactoolbaritem.sip:
+ Fixed QtMacExtras for iOS.
+ [058934cee148] <5.9-maint>
+
+ * QtAndroidExtras/QtAndroidExtrasmod.sip:
+ Added the QtAndroid namespace to QtAndroidExtras.
+ [170c3a17042e] <5.9-maint>
+
+2017-11-14 Phil Thompson <phil at riverbankcomputing.com>
+
+ * lib/configure.py:
+ Check that user supplied module names are valid.
+ [b1154438a794] <5.9-maint>
+
+2017-11-10 Phil Thompson <phil at riverbankcomputing.com>
+
+ * QtAndroidExtras/QtAndroidExtrasmod.sip,
+ QtAndroidExtras/qandroidjniobject.sip, lib/configure.py:
+ Added the QtAndroidExtras module containing a sub-set of the
+ QAndroidJniObject class.
+ [bad8eb717c80] <5.9-maint>
+
+2017-11-06 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Restored QUrl.query() for Qt v5.9.0 and earlier.
+ [3a40388e51bc] <5.9-maint>
+
2017-11-02 Phil Thompson <phil at riverbankcomputing.com>
+ * lib/configure.py:
+ Module .pro fixes for static builds.
+ [08ccbbe1325c] <5.9-maint>
+
+ * lib/configure.py:
+ Extension modules on macOS are now bundles rather than shared
+ libraries.
+ [2f298782351f] <5.9-maint>
+
+ * .hgtags:
+ Added tag 5.9.1 for changeset 6a8d6710ba64
+ [b68eec6b9b94] <5.9-maint>
+
* NEWS:
Released as v5.9.1.
[6a8d6710ba64] [5.9.1] <5.9-maint>
diff --git a/NEWS b/NEWS
index a2173ab..6976525 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v5.9.2 23rd November 2017
+ - Added support for Qt v5.9.3.
+ - Added the QtAndroidExtras module.
+
v5.9.1 1st November 2017
- Added support for Qt v5.9.2.
- Added the --allow-sip-warnings option to configure.py.
diff --git a/configure.py b/configure.py
index a1e56e8..a263efb 100644
--- a/configure.py
+++ b/configure.py
@@ -28,7 +28,7 @@ import sys
# Initialise the constants.
-PYQT_VERSION_STR = "5.9.1"
+PYQT_VERSION_STR = "5.9.2"
SIP_MIN_VERSION = '4.19.4'
@@ -62,6 +62,7 @@ MODULE_METADATA = {
qmake_TARGET='pyqt5'),
'QAxContainer': ModuleMetadata(qmake_QT=['axcontainer']),
'Qt': ModuleMetadata(qmake_QT=['-core', '-gui']),
+ 'QtAndroidExtras': ModuleMetadata(qmake_QT=['androidextras']),
'QtBluetooth': ModuleMetadata(qmake_QT=['bluetooth']),
'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib=True),
'QtDBus': ModuleMetadata(qmake_QT=['dbus', '-gui'],
@@ -155,9 +156,10 @@ MODULE_METADATA = {
# any modules that depend on it.
COMPOSITE_COMPONENTS = (
'QtCore',
- 'QtDBus', 'QtGui', 'QtNetwork', 'QtSensors', 'QtSerialPort',
- 'QtMultimedia', 'QtQml', 'QtWebKit', 'QtWidgets', 'QtXml', 'QtXmlPatterns',
- 'QtAxContainer', 'QtDesigner', 'QtHelp', 'QtMultimediaWidgets', 'QtOpenGL',
+ 'QtAndroidExtras', 'QtDBus', 'QtGui', 'QtNetwork', 'QtSensors',
+ 'QtSerialPort', 'QtMultimedia', 'QtQml', 'QtWebKit', 'QtWidgets', 'QtXml',
+ 'QtXmlPatterns', 'QtAxContainer', 'QtDesigner', 'QtHelp',
+ 'QtMultimediaWidgets', 'QtOpenGL',
'QtPrintSupport', 'QtQuick', 'QtSql', 'QtSvg', 'QtTest',
'QtWebKitWidgets', 'QtBluetooth', 'QtMacExtras', 'QtPositioning',
'QtWinExtras', 'QtX11Extras', 'QtQuickWidgets', 'QtWebSockets',
@@ -2525,7 +2527,9 @@ def generate_module_makefile(target_config, verbose, mname, include_paths=None,
pro_lines = ['TEMPLATE = lib']
- pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin'))
+ # Note some version of Qt5 (probably incorrectly) implements
+ # 'plugin_bundle' instead of 'plugin' so we specify both.
+ pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin plugin_bundle'))
pro_add_qt_dependencies(target_config, metadata, pro_lines)
@@ -2535,25 +2539,61 @@ def generate_module_makefile(target_config, verbose, mname, include_paths=None,
# Work around QTBUG-39300.
pro_lines.append('CONFIG -= android_install')
+ pro_lines.append('TARGET = %s' % target_name)
+
if not target_config.static:
debug_suffix = target_config.get_win32_debug_suffix()
+ # For Qt v5.5 make sure these frameworks are already loaded by the time
+ # the libqcocoa.dylib plugin gets loaded. This problem seems to be
+ # fixed in Qt v5.6.
+ extra_lflags = ''
+
+ if mname == 'QtGui':
+ # Note that this workaround is flawed because it looks at the PyQt
+ # configuration rather than the Qt configuration. It will fail if
+ # the user is building a PyQt without the QtDBus module against a
+ # Qt with the QtDBus library. However it will be fine for the
+ # common case where the PyQt configuration reflects the Qt
+ # configuration.
+ fwks = []
+ for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'):
+ if m in target_config.pyqt_modules:
+ fwks.append('-framework ' + m)
+
+ if len(fwks) != 0:
+ extra_lflags = 'QMAKE_LFLAGS += "%s"\n ' % ' '.join(fwks)
+
+ # Without the 'no_check_exist' magic the target.files must exist when
+ # qmake is run otherwise the install and uninstall targets are not
+ # generated.
shared = '''
win32 {
PY_MODULE = %s%s.pyd
- target.files = %s%s.pyd
+ PY_MODULE_SRC = $(DESTDIR_TARGET)
} else {
PY_MODULE = %s.so
- target.files = %s.so
+
+ macx {
+ PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
+
+ QMAKE_LFLAGS += "-undefined dynamic_lookup"
+
+ equals(QT_MINOR_VERSION, 5) {
+ %sQMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
+ }
+ } else {
+ PY_MODULE_SRC = $(TARGET)
+ }
}
-''' % (target_name, debug_suffix, target_name, debug_suffix, target_name, target_name)
- pro_lines.extend(shared.split('\n'))
+QMAKE_POST_LINK = $(COPY_FILE) $$PY_MODULE_SRC $$PY_MODULE
- # Without the 'no_check_exist' magic the target.files must exist when
- # qmake is run otherwise the install and uninstall targets are not
- # generated.
- pro_lines.append('target.CONFIG = no_check_exist')
+target.CONFIG = no_check_exist
+target.files = $$PY_MODULE
+''' % (target_name, debug_suffix, target_name, extra_lflags)
+
+ pro_lines.extend(shared.split('\n'))
if install_path == '':
install_path = target_config.pyqt_module_dir + '/PyQt5'
@@ -2603,47 +2643,6 @@ win32 {
if libs != '':
pro_lines.append('LIBS += %s' % libs)
- if not target_config.static:
- # For Qt v5.5 make sure these frameworks are already loaded by the time
- # the libqcocoa.dylib plugin gets loaded. This problem seems to be
- # fixed in Qt v5.6.
- extra_lflags = ''
-
- if mname == 'QtGui':
- # Note that this workaround is flawed because it looks at the PyQt
- # configuration rather than the Qt configuration. It will fail if
- # the user is building a PyQt without the QtDBus module against a
- # Qt with the QtDBus library. However it will be fine for the
- # common case where the PyQt configuration reflects the Qt
- # configuration.
- fwks = []
- for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'):
- if m in target_config.pyqt_modules:
- fwks.append('-framework ' + m)
-
- if len(fwks) != 0:
- extra_lflags = 'QMAKE_LFLAGS += "%s"\n ' % ' '.join(fwks)
-
- shared = '''
-win32 {
- QMAKE_POST_LINK = $(COPY_FILE) $(DESTDIR_TARGET) $$PY_MODULE
-} else {
- QMAKE_POST_LINK = $(COPY_FILE) $(TARGET) $$PY_MODULE
-}
-macx {
- QMAKE_LFLAGS += "-undefined dynamic_lookup"
- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
-
- equals(QT_MINOR_VERSION, 5) {
- %sQMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
- }
-}
-''' % extra_lflags
-
- pro_lines.extend(shared.split('\n'))
-
- pro_lines.append('TARGET = %s' % target_name)
-
if src_dir != mname:
pro_lines.append('INCLUDEPATH += %s' % qmake_quote(src_dir))
pro_lines.append('VPATH = %s' % qmake_quote(src_dir))
@@ -2926,6 +2925,11 @@ def main(argv):
# Check which modules to build if we haven't been told.
if len(target_config.pyqt_modules) == 0:
check_modules(target_config, opts.disabled_modules, opts.verbose)
+ else:
+ # Check that the user supplied module names are valid.
+ for mname in target_config.pyqt_modules:
+ if mname not in MODULE_METADATA:
+ error("'%s' is not a valid module name." % mname)
check_dbus(target_config, opts.verbose)
diff --git a/qpy/QtCore/qpycore_event_handlers.cpp b/qpy/QtCore/qpycore_event_handlers.cpp
index cb0bccb..9bf6256 100644
--- a/qpy/QtCore/qpycore_event_handlers.cpp
+++ b/qpy/QtCore/qpycore_event_handlers.cpp
@@ -103,9 +103,12 @@ void PyQtMonitor::on_destroyed(QObject *cppInst)
{
monitored.erase(it);
- PyObject *pyObj = sipGetPyObject(cppInst, sipType_QObject);
+ if (sipGetInterpreter())
+ {
+ PyObject *pyObj = sipGetPyObject(cppInst, sipType_QObject);
- if (pyObj)
- sipInstanceDestroyed((sipSimpleWrapper *)pyObj);
+ if (pyObj)
+ sipInstanceDestroyed((sipSimpleWrapper *)pyObj);
+ }
}
}
diff --git a/sip/QtAndroidExtras/QtAndroidExtrasmod.sip b/sip/QtAndroidExtras/QtAndroidExtrasmod.sip
new file mode 100644
index 0000000..e3693ac
--- /dev/null
+++ b/sip/QtAndroidExtras/QtAndroidExtrasmod.sip
@@ -0,0 +1,48 @@
+// This is the SIP interface definition for the QtAndroidExtras module of
+// PyQt v5.
+//
+// Copyright (c) 2017 Riverbank Computing Limited <info at riverbankcomputing.com>
+//
+// This file is part of PyQt5.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file. Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license. For more information contact
+// info at riverbankcomputing.com.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+%Module(name=PyQt5.QtAndroidExtras, keyword_arguments="Optional", use_limited_api=True)
+
+%Import QtCore/QtCoremod.sip
+
+%Copying
+Copyright (c) 2017 Riverbank Computing Limited <info at riverbankcomputing.com>
+
+This file is part of PyQt5.
+
+This file may be used under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation and appearing in
+the file LICENSE included in the packaging of this file. Please review the
+following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you do not wish to use this file under the terms of the GPL version 3.0
+then you may purchase a commercial license. For more information contact
+info at riverbankcomputing.com.
+
+This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+%End
+
+%DefaultSupertype sip.simplewrapper
+
+%Include qtandroid.sip
+%Include qandroidjniobject.sip
diff --git a/sip/QtMacExtras/qmactoolbaritem.sip b/sip/QtAndroidExtras/qandroidjniobject.sip
similarity index 53%
copy from sip/QtMacExtras/qmactoolbaritem.sip
copy to sip/QtAndroidExtras/qandroidjniobject.sip
index 6d8d82a..2f88ecd 100644
--- a/sip/QtMacExtras/qmactoolbaritem.sip
+++ b/sip/QtAndroidExtras/qandroidjniobject.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QMacToolBarItem.
+// This is the SIP interface definition for QAndroidJniObject.
//
// Copyright (c) 2017 Riverbank Computing Limited <info at riverbankcomputing.com>
//
@@ -18,46 +18,36 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-%If (Qt_5_3_0 -)
+%If (Qt_5_2_0 -)
-class NSToolbarItem;
-
-class QMacToolBarItem : QObject
+class QAndroidJniObject
{
%TypeHeaderCode
-#include <qmactoolbaritem.h>
+#include <qandroidjniobject.h>
%End
public:
- enum StandardItem
- {
- NoStandardItem,
- Space,
- FlexibleSpace
- };
-
- QMacToolBarItem(QObject *parent /TransferThis/ = 0);
- virtual ~QMacToolBarItem();
-
- bool selectable() const;
- void setSelectable(bool selectable);
-
- StandardItem standardItem() const;
- void setStandardItem(StandardItem standardItem);
+ QAndroidJniObject();
+ QAndroidJniObject(const char *className);
+ ~QAndroidJniObject();
- QString text() const;
- void setText(const QString &text);
-
- QIcon icon() const;
- void setIcon(const QIcon &icon);
+ int callMethod(const char *methodName) const;
+%MethodCode
+ sipRes = sipCpp->callMethod<int>(a0);
+%End
- NSToolbarItem *nativeToolBarItem() const;
+ static int callStaticMethod(const char *className, const char *methodName);
+%MethodCode
+ sipRes = QAndroidJniObject::callStaticMethod<int>(a0, a1);
+%End
-signals:
- void activated();
+ bool isValid() const;
+ QString toString() const;
-private:
- QMacToolBarItem(const QMacToolBarItem &);
+ static bool isClassAvailable(const char *className);
};
+bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &);
+bool operator==(const QAndroidJniObject &, const QAndroidJniObject &);
+
%End
diff --git a/sip/QtCore/qrunnable.sip b/sip/QtAndroidExtras/qtandroid.sip
similarity index 71%
copy from sip/QtCore/qrunnable.sip
copy to sip/QtAndroidExtras/qtandroid.sip
index 219d301..da083f8 100644
--- a/sip/QtCore/qrunnable.sip
+++ b/sip/QtAndroidExtras/qtandroid.sip
@@ -1,6 +1,4 @@
-// qrunnable.sip generated by MetaSIP
-//
-// This file is part of the QtCore Python extension module.
+// This is the SIP interface definition for QtAndroid.
//
// Copyright (c) 2017 Riverbank Computing Limited <info at riverbankcomputing.com>
//
@@ -20,16 +18,25 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-class QRunnable /Supertype=sip.wrapper/
+%If (Qt_5_3_0 -)
+
+namespace QtAndroid
{
%TypeHeaderCode
-#include <qrunnable.h>
+#include <QtAndroid>
+%End
+
+ int androidSdkVersion();
+ QAndroidJniObject androidActivity();
+
+%If (Qt_5_7_0 -)
+ QAndroidJniObject androidService();
+ void hideSplashScreen();
%End
-public:
- QRunnable();
- virtual ~QRunnable();
- virtual void run() = 0;
- bool autoDelete() const;
- void setAutoDelete(bool _autoDelete);
+%If (Qt_5_8_0 -)
+ QAndroidJniObject androidContext();
+%End
};
+
+%End
diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
index 019e764..347aaa2 100644
--- 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", use_limited_api=True)
-%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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2}
+%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_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3}
%Platforms {WS_X11 WS_WIN WS_MACX}
diff --git a/sip/QtCore/qglobal.sip b/sip/QtCore/qglobal.sip
index a0f00fd..2793d2c 100644
--- a/sip/QtCore/qglobal.sip
+++ b/sip/QtCore/qglobal.sip
@@ -29,8 +29,8 @@ int PYQT_VERSION;
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x050901;
-static const char *PYQT_VERSION_STR = "5.9.1";
+static int PYQT_VERSION = 0x050902;
+static const char *PYQT_VERSION_STR = "5.9.2";
%End
const int QT_VERSION;
const char *QT_VERSION_STR;
diff --git a/sip/QtCore/qrunnable.sip b/sip/QtCore/qrunnable.sip
index 219d301..1a3681b 100644
--- a/sip/QtCore/qrunnable.sip
+++ b/sip/QtCore/qrunnable.sip
@@ -29,7 +29,7 @@ class QRunnable /Supertype=sip.wrapper/
public:
QRunnable();
virtual ~QRunnable();
- virtual void run() = 0;
+ virtual void run() = 0 /NewThread/;
bool autoDelete() const;
void setAutoDelete(bool _autoDelete);
};
diff --git a/sip/QtCore/qurl.sip b/sip/QtCore/qurl.sip
index 6348f2b..b2fd921 100644
--- a/sip/QtCore/qurl.sip
+++ b/sip/QtCore/qurl.sip
@@ -268,9 +268,7 @@ public:
QString toDisplayString(QUrlTwoFlags<QUrl::UrlFormattingOption, QUrl::ComponentFormattingOption> options = QUrl::PrettyDecoded) const;
void setQuery(const QString &query, QUrl::ParsingMode mode = QUrl::TolerantMode);
void setQuery(const QUrlQuery &query);
-%If (Qt_5_9_1 -)
QString query(QUrl::ComponentFormattingOptions options = QUrl::PrettyDecoded) const;
-%End
%If (Qt_5_1_0 -)
static QStringList toStringList(const QList<QUrl> &uris, QUrlTwoFlags<QUrl::UrlFormattingOption, QUrl::ComponentFormattingOption> options = QUrl::PrettyDecoded);
%End
diff --git a/sip/QtMacExtras/qmacpasteboardmime.sip b/sip/QtMacExtras/qmacpasteboardmime.sip
index d14de67..c6d295b 100644
--- a/sip/QtMacExtras/qmacpasteboardmime.sip
+++ b/sip/QtMacExtras/qmacpasteboardmime.sip
@@ -20,6 +20,8 @@
%If (Qt_5_2_0 -)
+%If (PyQt_MacOSXOnly)
+
class QMacPasteboardMime
{
%TypeHeaderCode
@@ -58,3 +60,5 @@ public:
void qRegisterDraggedTypes(const QStringList &types);
%End
+
+%End
diff --git a/sip/QtMacExtras/qmactoolbar.sip b/sip/QtMacExtras/qmactoolbar.sip
index 5cd1092..6f4c7ec 100644
--- a/sip/QtMacExtras/qmactoolbar.sip
+++ b/sip/QtMacExtras/qmactoolbar.sip
@@ -20,6 +20,8 @@
%If (Qt_5_3_0 -)
+%If (PyQt_MacOSXOnly)
+
class NSToolbar;
class QMacToolBar : QObject
@@ -61,3 +63,5 @@ private:
};
%End
+
+%End
diff --git a/sip/QtMacExtras/qmactoolbaritem.sip b/sip/QtMacExtras/qmactoolbaritem.sip
index 6d8d82a..79ded48 100644
--- a/sip/QtMacExtras/qmactoolbaritem.sip
+++ b/sip/QtMacExtras/qmactoolbaritem.sip
@@ -20,6 +20,8 @@
%If (Qt_5_3_0 -)
+%If (PyQt_MacOSXOnly)
+
class NSToolbarItem;
class QMacToolBarItem : QObject
@@ -61,3 +63,5 @@ private:
};
%End
+
+%End
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git
More information about the Python-modules-commits
mailing list