Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

5 files changed, 141 insertions, 166 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro
index 401be6d42f..9f6c848e6a 100644
--- a/src/plugins/platforminputcontexts/ibus/ibus.pro
+++ b/src/plugins/platforminputcontexts/ibus/ibus.pro
@@ -1,10 +1,5 @@
 TARGET = ibusplatforminputcontextplugin
 
-PLUGIN_TYPE = platforminputcontexts
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
-load(qt_plugin)
-
 QT += dbus gui-private
 SOURCES += $$PWD/qibusplatforminputcontext.cpp \
            $$PWD/qibusproxy.cpp \
@@ -18,3 +13,8 @@ HEADERS += $$PWD/qibusplatforminputcontext.h \
            $$PWD/qibustypes.h
 
 OTHER_FILES += $$PWD/ibus.json
+
+PLUGIN_TYPE = platforminputcontexts
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp
index b47c0b40de..2846f52c8c 100644
--- a/src/plugins/platforminputcontexts/ibus/main.cpp
+++ b/src/plugins/platforminputcontexts/ibus/main.cpp
@@ -59,7 +59,6 @@ QIBusPlatformInputContext *QIbusPlatformInputContextPlugin::create(const QString
     Q_UNUSED(paramList);
 
     if (system.compare(system, QLatin1String("ibus"), Qt::CaseInsensitive) == 0) {
-        qDBusRegisterMetaType<QIBusSerializable>();
         qDBusRegisterMetaType<QIBusAttribute>();
         qDBusRegisterMetaType<QIBusAttributeList>();
         qDBusRegisterMetaType<QIBusText>();
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 2523b0b5dc..994fe8386b 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -289,7 +289,7 @@ void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint
 void QIBusPlatformInputContext::surroundingTextRequired()
 {
     if (debug)
-        qDebug() << "surroundingTextRequired";
+        qDebug("surroundingTextRequired");
     d->needsSurroundingText = true;
     update(Qt::ImSurroundingText);
 }
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
index a168836a06..ac82fa3931 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
@@ -50,13 +50,9 @@ QIBusSerializable::QIBusSerializable()
 {
 }
 
-QIBusSerializable::~QIBusSerializable()
+void QIBusSerializable::deserializeFrom(const QDBusArgument &argument)
 {
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusSerializable &object)
-{
-    argument >> object.name;
+    argument >> name;
 
     argument.beginMap();
     while (!argument.atEnd()) {
@@ -66,19 +62,18 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusSerializable
         argument >> key;
         argument >> value;
         argument.endMapEntry();
-        object.attachments[key] = value.variant().value<QDBusArgument>();
+        attachments[key] = value.variant().value<QDBusArgument>();
     }
     argument.endMap();
-    return argument;
 }
 
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusSerializable &object)
+void QIBusSerializable::serializeTo(QDBusArgument &argument) const
 {
-    argument << object.name;
+    argument << name;
 
     argument.beginMap(qMetaTypeId<QString>(), qMetaTypeId<QDBusVariant>());
 
-    QHashIterator<QString, QDBusArgument> i(object.attachments);
+    QHashIterator<QString, QDBusArgument> i(attachments);
     while (i.hasNext()) {
         i.next();
 
@@ -91,7 +86,6 @@ QDBusArgument &operator<<(QDBusArgument &argument, const QIBusSerializable &obje
         argument.endMapEntry();
     }
     argument.endMap();
-    return argument;
 }
 
 QIBusAttribute::QIBusAttribute()
@@ -103,43 +97,35 @@ QIBusAttribute::QIBusAttribute()
     name = "IBusAttribute";
 }
 
-QIBusAttribute::~QIBusAttribute()
-{
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute)
+void QIBusAttribute::serializeTo(QDBusArgument &argument) const
 {
     argument.beginStructure();
 
-    argument << static_cast<const QIBusSerializable &>(attribute);
+    QIBusSerializable::serializeTo(argument);
 
-    quint32 t = (quint32) attribute.type;
+    quint32 t = (quint32) type;
     argument << t;
-    argument << attribute.value;
-    argument << attribute.start;
-    argument << attribute.end;
+    argument << value;
+    argument << start;
+    argument << end;
 
     argument.endStructure();
-
-    return argument;
 }
 
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusAttribute &attribute)
+void QIBusAttribute::deserializeFrom(const QDBusArgument &argument)
 {
     argument.beginStructure();
 
-    argument >> static_cast<QIBusSerializable &>(attribute);
+    QIBusSerializable::deserializeFrom(argument);
 
     quint32 t;
     argument >> t;
-    attribute.type = (QIBusAttribute::Type) t;
-    argument >> attribute.value;
-    argument >> attribute.start;
-    argument >> attribute.end;
+    type = (QIBusAttribute::Type) t;
+    argument >> value;
+    argument >> start;
+    argument >> end;
 
     argument.endStructure();
-
-    return argument;
 }
 
 QTextCharFormat QIBusAttribute::format() const
@@ -187,34 +173,30 @@ QIBusAttributeList::QIBusAttributeList()
     name = "IBusAttrList";
 }
 
-QIBusAttributeList::~QIBusAttributeList()
-{
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttributeList &attrList)
+void QIBusAttributeList::serializeTo(QDBusArgument &argument) const
 {
     argument.beginStructure();
 
-    argument << static_cast<const QIBusSerializable &>(attrList);
+    QIBusSerializable::serializeTo(argument);
 
     argument.beginArray(qMetaTypeId<QDBusVariant>());
-    for (int i = 0; i < attrList.attributes.size(); ++i) {
+    for (int i = 0; i < attributes.size(); ++i) {
         QVariant variant;
-        variant.setValue(attrList.attributes.at(i));
+        variant.setValue(attributes.at(i));
         argument << QDBusVariant (variant);
     }
     argument.endArray();
 
     argument.endStructure();
-    return argument;
 }
 
-const QDBusArgument &operator>>(const QDBusArgument &arg, QIBusAttributeList &attrList)
+void QIBusAttributeList::deserializeFrom(const QDBusArgument &arg)
 {
     qCDebug(qtQpaInputMethodsSerialize) << "QIBusAttributeList::fromDBusArgument()" << arg.currentSignature();
+
     arg.beginStructure();
 
-    arg >> static_cast<QIBusSerializable &>(attrList);
+    QIBusSerializable::deserializeFrom(arg);
 
     arg.beginArray();
     while (!arg.atEnd()) {
@@ -223,12 +205,11 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, QIBusAttributeList &at
 
         QIBusAttribute attr;
         var.variant().value<QDBusArgument>() >> attr;
-        attrList.attributes.append(attr);
+        attributes.append(std::move(attr));
     }
     arg.endArray();
 
     arg.endStructure();
-    return arg;
 }
 
 QList<QInputMethodEvent::Attribute> QIBusAttributeList::imAttributes() const
@@ -269,138 +250,115 @@ QIBusText::QIBusText()
     name = "IBusText";
 }
 
-QIBusText::~QIBusText()
-{
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusText &text)
+void QIBusText::serializeTo(QDBusArgument &argument) const
 {
     argument.beginStructure();
 
-    argument << static_cast<const QIBusSerializable &>(text);
+    QIBusSerializable::serializeTo(argument);
 
-    argument << text.text << text.attributes;
+    argument << text << attributes;
     argument.endStructure();
-    return argument;
 }
 
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusText &text)
+void QIBusText::deserializeFrom(const QDBusArgument &argument)
 {
     qCDebug(qtQpaInputMethodsSerialize) << "QIBusText::fromDBusArgument()" << argument.currentSignature();
+
     argument.beginStructure();
 
-    argument >> static_cast<QIBusSerializable &>(text);
+    QIBusSerializable::deserializeFrom(argument);
 
-    argument >> text.text;
+    argument >> text;
     QDBusVariant variant;
     argument >> variant;
-    variant.variant().value<QDBusArgument>() >> text.attributes;
+    variant.variant().value<QDBusArgument>() >> attributes;
 
     argument.endStructure();
-    return argument;
 }
 
 QIBusEngineDesc::QIBusEngineDesc()
-    : engine_name(""),
-      longname(""),
-      description(""),
-      language(""),
-      license(""),
-      author(""),
-      icon(""),
-      layout(""),
-      rank(0),
-      hotkeys(""),
-      symbol(""),
-      setup(""),
-      layout_variant(""),
-      layout_option(""),
-      version(""),
-      textdomain(""),
-      iconpropkey("")
+    : rank(0)
 {
     name = "IBusEngineDesc";
 }
 
-QIBusEngineDesc::~QIBusEngineDesc()
-{
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusEngineDesc &desc)
+void QIBusEngineDesc::serializeTo(QDBusArgument &argument) const
 {
     argument.beginStructure();
 
-    argument << static_cast<const QIBusSerializable &>(desc);
-
-    argument << desc.engine_name;
-    argument << desc.longname;
-    argument << desc.description;
-    argument << desc.language;
-    argument << desc.license;
-    argument << desc.author;
-    argument << desc.icon;
-    argument << desc.layout;
-    argument << desc.rank;
-    argument << desc.hotkeys;
-    argument << desc.symbol;
-    argument << desc.setup;
-    argument << desc.layout_variant;
-    argument << desc.layout_option;
-    argument << desc.version;
-    argument << desc.textdomain;
-    argument << desc.iconpropkey;
+    QIBusSerializable::serializeTo(argument);
+
+    argument << engine_name;
+    argument << longname;
+    argument << description;
+    argument << language;
+    argument << license;
+    argument << author;
+    argument << icon;
+    argument << layout;
+    argument << rank;
+    argument << hotkeys;
+    argument << symbol;
+    argument << setup;
+    argument << layout_variant;
+    argument << layout_option;
+    argument << version;
+    argument << textdomain;
+    argument << iconpropkey;
 
     argument.endStructure();
-    return argument;
 }
 
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusEngineDesc &desc)
+void QIBusEngineDesc::deserializeFrom(const QDBusArgument &argument)
 {
     qCDebug(qtQpaInputMethodsSerialize) << "QIBusEngineDesc::fromDBusArgument()" << argument.currentSignature();
     argument.beginStructure();
 
-    argument >> static_cast<QIBusSerializable &>(desc);
-
-    argument >> desc.engine_name;
-    argument >> desc.longname;
-    argument >> desc.description;
-    argument >> desc.language;
-    argument >> desc.license;
-    argument >> desc.author;
-    argument >> desc.icon;
-    argument >> desc.layout;
-    argument >> desc.rank;
-    argument >> desc.hotkeys;
-    argument >> desc.symbol;
-    argument >> desc.setup;
+    QIBusSerializable::deserializeFrom(argument);
+
+    argument >> engine_name;
+    argument >> longname;
+    argument >> description;
+    argument >> language;
+    argument >> license;
+    argument >> author;
+    argument >> icon;
+    argument >> layout;
+    argument >> rank;
+    argument >> hotkeys;
+    argument >> symbol;
+    argument >> setup;
     // Previous IBusEngineDesc supports the arguments between engine_name
     // and setup.
-    if (argument.currentSignature() == "") {
-        argument.endStructure();
-        return argument;
-    }
-    argument >> desc.layout_variant;
-    argument >> desc.layout_option;
+    if (argument.currentSignature() == "")
+        goto olderThanV2;
+    argument >> layout_variant;
+    argument >> layout_option;
     // Previous IBusEngineDesc supports the arguments between engine_name
     // and layout_option.
-    if (argument.currentSignature() == "") {
-        argument.endStructure();
-        return argument;
-    }
-    argument >> desc.version;
-    if (argument.currentSignature() == "") {
-        argument.endStructure();
-        return argument;
-    }
-    argument >> desc.textdomain;
-    if (argument.currentSignature() == "") {
-        argument.endStructure();
-        return argument;
-    }
-    argument >> desc.iconpropkey;
-
+    if (argument.currentSignature() == "")
+        goto olderThanV3;
+    argument >> version;
+    if (argument.currentSignature() == "")
+        goto olderThanV4;
+    argument >> textdomain;
+    if (argument.currentSignature() == "")
+        goto olderThanV5;
+    argument >> iconpropkey;
+    // <-- insert new member streaming here (1/2)
+    goto newest;
+olderThanV2:
+    layout_variant.clear();
+    layout_option.clear();
+olderThanV3:
+    version.clear();
+olderThanV4:
+    textdomain.clear();
+olderThanV5:
+    iconpropkey.clear();
+    // <-- insert new members here (2/2)
+newest:
     argument.endStructure();
-    return argument;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h
index 9dca7e3903..217cd836fc 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.h
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h
@@ -54,13 +54,15 @@ class QIBusSerializable
 {
 public:
     QIBusSerializable();
-    virtual ~QIBusSerializable();
+
+    void serializeTo(QDBusArgument &argument) const;
+    void deserializeFrom(const QDBusArgument &argument);
 
     QString name;
     QHash<QString, QDBusArgument>  attachments;
 };
 
-class QIBusAttribute : public QIBusSerializable
+class QIBusAttribute : private QIBusSerializable
 {
 public:
     enum Type {
@@ -79,42 +81,53 @@ public:
     };
 
     QIBusAttribute();
-    ~QIBusAttribute();
 
     QTextCharFormat format() const;
 
+    void serializeTo(QDBusArgument &argument) const;
+    void deserializeFrom(const QDBusArgument &argument);
+
     Type type;
     quint32 value;
     quint32 start;
     quint32 end;
 };
+Q_DECLARE_TYPEINFO(QIBusAttribute, Q_MOVABLE_TYPE);
 
-class QIBusAttributeList : public QIBusSerializable
+class QIBusAttributeList : private QIBusSerializable
 {
 public:
     QIBusAttributeList();
-    ~QIBusAttributeList();
 
     QList<QInputMethodEvent::Attribute> imAttributes() const;
 
+    void serializeTo(QDBusArgument &argument) const;
+    void deserializeFrom(const QDBusArgument &argument);
+
     QVector<QIBusAttribute> attributes;
 };
+Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_MOVABLE_TYPE);
 
-class QIBusText : public QIBusSerializable
+class QIBusText : private QIBusSerializable
 {
 public:
     QIBusText();
-    ~QIBusText();
+
+    void serializeTo(QDBusArgument &argument) const;
+    void deserializeFrom(const QDBusArgument &argument);
 
     QString text;
     QIBusAttributeList attributes;
 };
+Q_DECLARE_TYPEINFO(QIBusText, Q_MOVABLE_TYPE);
 
-class QIBusEngineDesc : public QIBusSerializable
+class QIBusEngineDesc : private QIBusSerializable
 {
 public:
     QIBusEngineDesc();
-    ~QIBusEngineDesc();
+
+    void serializeTo(QDBusArgument &argument) const;
+    void deserializeFrom(const QDBusArgument &argument);
 
     QString engine_name;
     QString longname;
@@ -134,25 +147,30 @@ public:
     QString textdomain;
     QString iconpropkey;
 };
+Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_MOVABLE_TYPE);
 
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusSerializable &object);
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusSerializable &object);
-
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute);
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusAttribute &attribute);
+inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute)
+{ attribute.serializeTo(argument); return argument; }
+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusAttribute &attribute)
+{ attribute.deserializeFrom(argument); return argument; }
 
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttributeList &attributeList);
-const QDBusArgument &operator>>(const QDBusArgument &arg, QIBusAttributeList &attrList);
+inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttributeList &attributeList)
+{ attributeList.serializeTo(argument); return argument; }
+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusAttributeList &attributeList)
+{ attributeList.deserializeFrom(argument); return argument; }
 
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusText &text);
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusText &text);
+inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusText &text)
+{ text.serializeTo(argument); return argument; }
+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusText &text)
+{ text.deserializeFrom(argument); return argument; }
 
-QDBusArgument &operator<<(QDBusArgument &argument, const QIBusEngineDesc &desc);
-const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusEngineDesc &desc);
+inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusEngineDesc &desc)
+{ desc.serializeTo(argument); return argument; }
+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusEngineDesc &desc)
+{ desc.deserializeFrom(argument); return argument; }
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QIBusSerializable)
 Q_DECLARE_METATYPE(QIBusAttribute)
 Q_DECLARE_METATYPE(QIBusAttributeList)
 Q_DECLARE_METATYPE(QIBusText)