diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
| commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
| tree | de69be5e25a1acd3207a8952376f634fe94fefcc /src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h | |
| parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
| parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h')
| -rw-r--r-- | src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h b/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h index a2e468da94..deab9e74b5 100644 --- a/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h +++ b/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h @@ -92,19 +92,19 @@ class QStatusNotifierItemAdaptor: public QDBusAbstractAdaptor " <property access=\"read\" type=\"o\" name=\"Menu\"/>\n" " <property access=\"read\" type=\"b\" name=\"ItemIsMenu\"/>\n" " <property access=\"read\" type=\"s\" name=\"IconName\"/>\n" -" <property access=\"read\" type=\"(iiay)\" name=\"IconPixmap\">\n" +" <property access=\"read\" type=\"a(iiay)\" name=\"IconPixmap\">\n" " <annotation value=\"QXdgDBusImageVector\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n" " </property>\n" " <property access=\"read\" type=\"s\" name=\"OverlayIconName\"/>\n" -" <property access=\"read\" type=\"(iiay)\" name=\"OverlayIconPixmap\">\n" +" <property access=\"read\" type=\"a(iiay)\" name=\"OverlayIconPixmap\">\n" " <annotation value=\"QXdgDBusImageVector\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n" " </property>\n" " <property access=\"read\" type=\"s\" name=\"AttentionIconName\"/>\n" -" <property access=\"read\" type=\"(iiay)\" name=\"AttentionIconPixmap\">\n" +" <property access=\"read\" type=\"a(iiay)\" name=\"AttentionIconPixmap\">\n" " <annotation value=\"QXdgDBusImageVector\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n" " </property>\n" " <property access=\"read\" type=\"s\" name=\"AttentionMovieName\"/>\n" -" <property access=\"read\" type=\"(s(iiay)ss)\" name=\"ToolTip\">\n" +" <property access=\"read\" type=\"(sa(iiay)ss)\" name=\"ToolTip\">\n" " <annotation value=\"QXdgDBusToolTipStruct\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n" " </property>\n" " <method name=\"ContextMenu\">\n" |