Hello community,
here is the log from the commit of package libqt5-qtwebchannel for openSUSE:Factory checked in at 2015-03-01 15:26:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebchannel (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebchannel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebchannel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebchannel/libqt5-qtwebchannel.changes 2015-01-08 23:01:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebchannel.new/libqt5-qtwebchannel.changes 2015-03-01 15:26:57.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Feb 24 16:10:33 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.4.1
+ * For more details please see:
+ http://blog.qt.io/blog/2015/02/24/qt-5-4-1-released/
+- Split the imports into separate package
+- Add minimal requires on libQtQuick5
+
+-------------------------------------------------------------------
Old:
----
qtwebchannel-opensource-src-5.4.0.tar.xz
New:
----
qtwebchannel-opensource-src-5.4.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebchannel.spec ++++++
--- /var/tmp/diff_new_pack.R5JmNK/_old 2015-03-01 15:26:58.000000000 +0100
+++ /var/tmp/diff_new_pack.R5JmNK/_new 2015-03-01 15:26:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtwebchannel
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
%define qt5_snapshot 0
%define libname libQt5WebChannel5
%define base_name libqt5
-%define real_version 5.4.0
-%define so_version 5.4.0
+%define real_version 5.4.1
+%define so_version 5.4.1
%define tar_version qtwebchannel-opensource-src-%{real_version}
Name: libqt5-qtwebchannel
-Version: 5.4.0
+Version: 5.4.1
Release: 0
Summary: Qt 5 WebChannel Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
@@ -51,10 +51,25 @@
%package -n %{libname}
Summary: Qt 5 WebChannel Addon
Group: Development/Libraries/X11
+%requires_ge libQtQuick5
%description -n %{libname}
Qt is a set of libraries for developing applications.
+%package -n %{libname}-imports
+Summary: Qt 5 WebSockets Library - QML imports
+Group: Development/Libraries/X11
+Supplements: packageand(%{libname}:libQtQuick5)
+# imports splited with 5.4.1
+Conflicts: %{libname} < 5.4.1
+%requires_ge libQtQuick5
+
+%description -n %{libname}-imports
+Qt is a set of libraries for developing applications.
+
+This package contains base tools, like string, xml, and network
+handling.
+
%package devel
Summary: Qt Development Kit
Group: Development/Libraries/X11
@@ -106,6 +121,10 @@
%defattr(-,root,root,755)
%doc LGPL_EXCEPTION.txt LICENSE.*
%{_libqt5_libdir}/libQt5WebChannel.so.*
+
+%files -n %{libname}-imports
+%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.*
%{_libqt5_archdatadir}/qml/QtWebChannel/
%files private-headers-devel
++++++ qtwebchannel-opensource-src-5.4.0.tar.xz -> qtwebchannel-opensource-src-5.4.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/.qmake.conf new/qtwebchannel-opensource-src-5.4.1/.qmake.conf
--- old/qtwebchannel-opensource-src-5.4.0/.qmake.conf 2014-12-05 17:24:38.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/.qmake.conf 2015-02-17 05:56:55.000000000 +0100
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs warning_clean
-MODULE_VERSION = 5.4.0
+MODULE_VERSION = 5.4.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/.tag new/qtwebchannel-opensource-src-5.4.1/.tag
--- old/qtwebchannel-opensource-src-5.4.0/.tag 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/.tag 2015-02-17 05:56:55.000000000 +0100
@@ -1 +1 @@
-86d77a900852691267f556fbde98406a12ee4310
+616a5ea6ea99882de7e65c80b362699742448b75
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qmetaobjectpublisher_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qmetaobjectpublisher_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qmetaobjectpublisher_p.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qmetaobjectpublisher_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/webchannel/qmetaobjectpublisher_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qqmlwebchannelattached_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qqmlwebchannelattached_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qqmlwebchannelattached_p.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qqmlwebchannelattached_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/webchannel/qqmlwebchannelattached_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qwebchannel_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qwebchannel_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/qwebchannel_p.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/qwebchannel_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/webchannel/qwebchannel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/signalhandler_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/signalhandler_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/signalhandler_p.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/signalhandler_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/webchannel/signalhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/variantargument_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/variantargument_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.0/QtWebChannel/private/variantargument_p.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.0/QtWebChannel/private/variantargument_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/webchannel/variantargument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qmetaobjectpublisher_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qmetaobjectpublisher_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qmetaobjectpublisher_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qmetaobjectpublisher_p.h 2015-02-17 05:56:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/webchannel/qmetaobjectpublisher_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qqmlwebchannelattached_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qqmlwebchannelattached_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qqmlwebchannelattached_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qqmlwebchannelattached_p.h 2015-02-17 05:56:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/webchannel/qqmlwebchannelattached_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qwebchannel_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qwebchannel_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/qwebchannel_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/qwebchannel_p.h 2015-02-17 05:56:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/webchannel/qwebchannel_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/signalhandler_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/signalhandler_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/signalhandler_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/signalhandler_p.h 2015-02-17 05:56:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/webchannel/signalhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/variantargument_p.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/variantargument_p.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/5.4.1/QtWebChannel/private/variantargument_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/5.4.1/QtWebChannel/private/variantargument_p.h 2015-02-17 05:56:55.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/webchannel/variantargument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/qtwebchannelversion.h new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/qtwebchannelversion.h
--- old/qtwebchannel-opensource-src-5.4.0/include/QtWebChannel/qtwebchannelversion.h 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/include/QtWebChannel/qtwebchannelversion.h 2015-02-17 05:56:55.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBCHANNEL_VERSION_H
#define QT_QTWEBCHANNEL_VERSION_H
-#define QTWEBCHANNEL_VERSION_STR "5.4.0"
+#define QTWEBCHANNEL_VERSION_STR "5.4.1"
-#define QTWEBCHANNEL_VERSION 0x050400
+#define QTWEBCHANNEL_VERSION 0x050401
#endif // QT_QTWEBCHANNEL_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/src/imports/webchannel/plugins.qmltypes new/qtwebchannel-opensource-src-5.4.1/src/imports/webchannel/plugins.qmltypes
--- old/qtwebchannel-opensource-src-5.4.0/src/imports/webchannel/plugins.qmltypes 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/src/imports/webchannel/plugins.qmltypes 2015-02-17 05:56:55.000000000 +0100
@@ -4,49 +4,21 @@
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -notrelocatable QtWebChannel 1.0'
+// 'qmlplugindump -nonrelocatable QtWebChannel 1.0'
Module {
Component {
- name: "QWebChannel"
- prototype: "QObject"
- Property { name: "blockUpdates"; type: "bool" }
- Signal {
- name: "blockUpdatesChanged"
- Parameter { name: "block"; type: "bool" }
- }
- Method {
- name: "sendMessage"
- Parameter { name: "id"; type: "QJsonValue" }
- Parameter { name: "data"; type: "QJsonValue" }
- }
- Method {
- name: "sendMessage"
- Parameter { name: "id"; type: "QJsonValue" }
- }
- Method {
- name: "registerObject"
- Parameter { name: "id"; type: "string" }
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- Method {
- name: "deregisterObject"
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- }
- Component {
- name: "QmlWebChannel"
+ name: "QQmlWebChannel"
prototype: "QWebChannel"
exports: ["QtWebChannel/WebChannel 1.0"]
exportMetaObjectRevisions: [0]
- attachedType: "QmlWebChannelAttached"
+ attachedType: "QQmlWebChannelAttached"
Property { name: "transports"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "registeredObjects"; type: "QObject"; isList: true; isReadonly: true }
Method {
name: "registerObjects"
Parameter { name: "objects"; type: "QVariantMap" }
}
- Method { name: "test_clientIsIdle"; type: "bool" }
Method {
name: "connectTo"
Parameter { name: "transport"; type: "QObject"; isPointer: true }
@@ -57,7 +29,7 @@
}
}
Component {
- name: "QmlWebChannelAttached"
+ name: "QQmlWebChannelAttached"
prototype: "QObject"
Property { name: "id"; type: "string" }
Signal {
@@ -65,4 +37,30 @@
Parameter { name: "id"; type: "string" }
}
}
+ Component {
+ name: "QWebChannel"
+ prototype: "QObject"
+ Property { name: "blockUpdates"; type: "bool" }
+ Signal {
+ name: "blockUpdatesChanged"
+ Parameter { name: "block"; type: "bool" }
+ }
+ Method {
+ name: "connectTo"
+ Parameter { name: "transport"; type: "QWebChannelAbstractTransport"; isPointer: true }
+ }
+ Method {
+ name: "disconnectFrom"
+ Parameter { name: "transport"; type: "QWebChannelAbstractTransport"; isPointer: true }
+ }
+ Method {
+ name: "registerObject"
+ Parameter { name: "id"; type: "string" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "deregisterObject"
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/src/imports/webchannel/webchannel.pro new/qtwebchannel-opensource-src-5.4.1/src/imports/webchannel/webchannel.pro
--- old/qtwebchannel-opensource-src-5.4.0/src/imports/webchannel/webchannel.pro 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/src/imports/webchannel/webchannel.pro 2015-02-17 05:56:55.000000000 +0100
@@ -3,6 +3,8 @@
INCLUDEPATH += ../../webchannel
VPATH += ../../webchannel
+IMPORT_VERSION = 1.0
+
SOURCES += \
plugin.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebchannel-opensource-src-5.4.0/src/webchannel/qmetaobjectpublisher.cpp new/qtwebchannel-opensource-src-5.4.1/src/webchannel/qmetaobjectpublisher.cpp
--- old/qtwebchannel-opensource-src-5.4.0/src/webchannel/qmetaobjectpublisher.cpp 2014-12-05 17:24:39.000000000 +0100
+++ new/qtwebchannel-opensource-src-5.4.1/src/webchannel/qmetaobjectpublisher.cpp 2015-02-17 05:56:55.000000000 +0100
@@ -95,15 +95,18 @@
void QMetaObjectPublisher::registerObject(const QString &id, QObject *object)
{
- if (propertyUpdatesInitialized) {
- qWarning("Registered new object after initialization. This does not work!");
- return;
- }
registeredObjects[id] = object;
registeredObjectIds[object] = id;
+ if (propertyUpdatesInitialized) {
+ if (!webChannel->d_func()->transports.isEmpty()) {
+ qWarning("Registered new object after initialization, existing clients won't be notified!");
+ // TODO: send a message to clients that an object was added
+ }
+ initializePropertyUpdates(object, classInfoForObject(object));
+ }
}
-QJsonObject QMetaObjectPublisher::classInfoForObject(const QObject *object) const
+QJsonObject QMetaObjectPublisher::classInfoForObject(const QObject *object)
{
QJsonObject data;
if (!object) {
@@ -151,7 +154,7 @@
prop.name(), object->metaObject()->className());
}
propertyInfo.append(signalInfo);
- propertyInfo.append(QJsonValue::fromVariant(prop.read(object)));
+ propertyInfo.append(wrapResult(prop.read(object)));
qtProperties.append(propertyInfo);
}
for (int i = 0; i < metaObject->methodCount(); ++i) {
@@ -289,7 +292,7 @@
foreach (const int propertyIndex, objectsSignalToPropertyMap.value(sigIt.key())) {
const QMetaProperty &property = metaObject->property(propertyIndex);
Q_ASSERT(property.isValid());
- properties[QString::number(propertyIndex)] = QJsonValue::fromVariant(property.read(object));
+ properties[QString::number(propertyIndex)] = wrapResult(property.read(object));
}
sigs[QString::number(sigIt.key())] = QJsonArray::fromVariantList(sigIt.value());
}
@@ -365,6 +368,8 @@
void QMetaObjectPublisher::signalEmitted(const QObject *object, const int signalIndex, const QVariantList &arguments)
{
if (!webChannel || webChannel->d_func()->transports.isEmpty()) {
+ if (signalIndex == s_destroyedSignalIndex)
+ objectDestroyed(object);
return;
}
if (!signalToPropertyMap.value(object).contains(signalIndex)) {
@@ -374,9 +379,7 @@
message[KEY_OBJECT] = objectName;
message[KEY_SIGNAL] = signalIndex;
if (!arguments.isEmpty()) {
- // TODO: wrap (new) objects on the fly
- QJsonArray args = QJsonArray::fromVariantList(arguments);
- message[KEY_ARGS] = args;
+ message[KEY_ARGS] = wrapList(arguments);
}
message[KEY_TYPE] = TypeSignal;
broadcastMessage(message);
@@ -400,6 +403,7 @@
Q_ASSERT(removed);
Q_UNUSED(removed);
+ signalHandler.remove(object);
signalToPropertyMap.remove(object);
pendingPropertyUpdates.remove(object);
wrappedObjects.remove(object);
@@ -408,33 +412,49 @@
QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result)
{
if (QObject *object = result.value