diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 13:04:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 20:12:27 +0200 |
| commit | ef25620ac1acbe7a723b6b213d7d50468a748119 (patch) | |
| tree | abdff2aed36655dfb0305d232b0ac48f8ad67391 /src/3rdparty | |
| parent | 669add92d9adc15ecfa0b2d62dd90ea9066d401e (diff) | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/features/qpa/genericunixfontdatabase.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/resolve_config.prf
mkspecs/macx-ios-clang/features/default_post.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
src/corelib/io/qiodevice.cpp
Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/atspi2/xml/Cache.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/atspi2/xml/Cache.xml b/src/3rdparty/atspi2/xml/Cache.xml index 9d0c5801a9..01c52810ac 100644 --- a/src/3rdparty/atspi2/xml/Cache.xml +++ b/src/3rdparty/atspi2/xml/Cache.xml @@ -9,12 +9,12 @@ <signal name="AddAccessible"> <arg name="nodeAdded" type="((so)(so)a(so)assusau)"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheItem"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAccessibleCacheItem"/> </signal> <signal name="RemoveAccessible"> <arg name="nodeRemoved" type="(so)"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/> </signal> </interface> |