Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Require Qt4.8.1 and CMake deprecate warnings ..." 

This reverts commit e1124403fd.

qdbusxml2cpp did not support new annotation names until 4.8.2
This commit is contained in:
John Maguire 2016-03-31 15:06:14 +01:00
parent ed13d02231
commit 1489191794
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -32,7 +32,7 @@ if (UNIX AND NOT APPLE)
set(LINUX 1) set(LINUX 1)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
find_package(Qt4 4.8.1 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml) find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
if(NOT APPLE) if(NOT APPLE)
find_package(Qt4 COMPONENTS QtWebKit) find_package(Qt4 COMPONENTS QtWebKit)

4
src/dbus/org.freedesktop.Avahi.EntryGroup.xml
View File

@ -51,7 +51,7 @@
<arg name="host" type="s" direction="in"/> <arg name="host" type="s" direction="in"/>
<arg name="port" type="q" direction="in"/> <arg name="port" type="q" direction="in"/>
<arg name="txt" type="aay" direction="in"/> <arg name="txt" type="aay" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In8" <annotation name="com.trolltech.QtDBus.QtTypeName.In8"
value="QList&lt;QByteArray&gt;" /> value="QList&lt;QByteArray&gt;" />
</method> </method>
@ -73,7 +73,7 @@
<arg name="type" type="s" direction="in"/> <arg name="type" type="s" direction="in"/>
<arg name="domain" type="s" direction="in"/> <arg name="domain" type="s" direction="in"/>
<arg name="txt" type="aay" direction="in"/> <arg name="txt" type="aay" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In6" <annotation name="com.trolltech.QtDBus.QtTypeName.In6"
value="QList&lt;QByteArray&gt;" /> value="QList&lt;QByteArray&gt;" />
</method> </method>

2
src/dbus/org.freedesktop.Avahi.Server.xml
View File

@ -132,7 +132,7 @@
<arg name="address" type="s" direction="out"/> <arg name="address" type="s" direction="out"/>
<arg name="port" type="q" direction="out"/> <arg name="port" type="q" direction="out"/>
<arg name="txt" type="aay" direction="out"/> <arg name="txt" type="aay" direction="out"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out9" <annotation name="com.trolltech.QtDBus.QtTypeName.Out9"
value="QList&lt;QByteArray&gt;" /> value="QList&lt;QByteArray&gt;" />
<arg name="flags" type="u" direction="out"/> <arg name="flags" type="u" direction="out"/>
</method> </method>

2
src/dbus/org.freedesktop.Notifications.xml
View File

@ -22,7 +22,7 @@
<arg name="body" type="s" direction="in"/> <arg name="body" type="s" direction="in"/>
<arg name="actions" type="as" direction="in"/> <arg name="actions" type="as" direction="in"/>
<arg name="hints" type="a{sv}" direction="in"/> <arg name="hints" type="a{sv}" direction="in"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/> <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
<arg name="timeout" type="i" direction="in"/> <arg name="timeout" type="i" direction="in"/>
<arg name="return_id" type="u" direction="out"/> <arg name="return_id" type="u" direction="out"/>
</method> </method>

8
src/dbus/org.freedesktop.UDisks.Device.xml
View File

@ -636,7 +636,7 @@
<method name="FilesystemListOpenFiles"> <method name="FilesystemListOpenFiles">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantList" /> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantList" />
<arg name="processes" direction="out" type="a(uus)"> <arg name="processes" direction="out" type="a(uus)">
<doc:doc><doc:summary> <doc:doc><doc:summary>
An array of triples (<doc:tt>pid</doc:tt>, <doc:tt>uid</doc:tt>, command line for the process An array of triples (<doc:tt>pid</doc:tt>, <doc:tt>uid</doc:tt>, command line for the process
@ -1355,9 +1355,9 @@
<method name="DriveBenchmark"> <method name="DriveBenchmark">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantList" /> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantList" />
<annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantList" /> <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="QVariantList" />
<annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QVariantList" /> <annotation name="com.trolltech.QtDBus.QtTypeName.Out2" value="QVariantList" />
<arg name="do_write_benchmark" direction="in" type="b"> <arg name="do_write_benchmark" direction="in" type="b">
<doc:doc><doc:summary> <doc:doc><doc:summary>

2
src/dbus/org.freedesktop.UDisks.xml
View File

@ -1051,7 +1051,7 @@
<!-- TODO: maybe this should return a dictionary so we can grow it in the future? --> <!-- TODO: maybe this should return a dictionary so we can grow it in the future? -->
<property name="KnownFilesystems" type="a(ssbbbubbbbbbbb)" access="read"> <property name="KnownFilesystems" type="a(ssbbbubbbbbbbb)" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantList"> <annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantList">
<doc:doc><doc:description><doc:para> <doc:doc><doc:description><doc:para>
An array of file systems known to the daemon and what features are supported. An array of file systems known to the daemon and what features are supported.
Each element in the array contains the following members: Each element in the array contains the following members:

2
src/dbus/org.mpris.MediaPlayer2.Player.xml
View File

@ -27,7 +27,7 @@
<property name='Rate' type='d' access='readwrite'/> <property name='Rate' type='d' access='readwrite'/>
<property name='Shuffle' type='b' access='readwrite'/> <property name='Shuffle' type='b' access='readwrite'/>
<property name='Metadata' type='a{sv}' access='read'> <property name='Metadata' type='a{sv}' access='read'>
<annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/> <annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantMap"/>
</property> </property>
<property name='Volume' type='d' access='readwrite'/> <property name='Volume' type='d' access='readwrite'/>
<property name='Position' type='x' access='read'/> <property name='Position' type='x' access='read'/>

8
src/dbus/org.mpris.MediaPlayer2.Playlists.xml
View File

@ -6,7 +6,7 @@
<property name='PlaylistCount' type='u' access='read' /> <property name='PlaylistCount' type='u' access='read' />
<property name='Orderings' type='as' access='read' /> <property name='Orderings' type='as' access='read' />
<property name='ActivePlaylist' type='(b(oss))' access='read'> <property name='ActivePlaylist' type='(b(oss))' access='read'>
<annotation name="org.qtproject.QtDBus.QtTypeName" value="MaybePlaylist"/> <annotation name="com.trolltech.QtDBus.QtTypeName" value="MaybePlaylist"/>
</property> </property>
<method name='ActivatePlaylist'> <method name='ActivatePlaylist'>
<arg direction='in' name='PlaylistId' type='o' /> <arg direction='in' name='PlaylistId' type='o' />
@ -17,12 +17,12 @@
<arg direction='in' name='Order' type='s' /> <arg direction='in' name='Order' type='s' />
<arg direction='in' name='ReverseOrder' type='b' /> <arg direction='in' name='ReverseOrder' type='b' />
<arg direction='out' name='Playlists' type='a(oss)' /> <arg direction='out' name='Playlists' type='a(oss)' />
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MprisPlaylistList"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MprisPlaylistList"/>
</method> </method>
<signal name='PlaylistChanged'> <signal name='PlaylistChanged'>
<arg name='Playlist' type='(oss)' /> <arg name='Playlist' type='(oss)' />
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MprisPlaylist" /> <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MprisPlaylist" />
</signal> </signal>
<annotation name="org.qtproject.QtDBus.QtTypeName" value="MaybePlaylist" /> <annotation name="com.trolltech.QtDBus.QtTypeName" value="MaybePlaylist" />
</interface> </interface>
</node> </node>

6
src/dbus/org.mpris.MediaPlayer2.TrackList.xml
View File

@ -6,7 +6,7 @@
<method name='GetTracksMetadata'> <method name='GetTracksMetadata'>
<arg direction='in' name='TrackIds' type='ao'/> <arg direction='in' name='TrackIds' type='ao'/>
<arg direction='out' name='Metadata' type='aa{sv}'> <arg direction='out' name='Metadata' type='aa{sv}'>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="TrackMetadata" /> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="TrackMetadata" />
</arg> </arg>
</method> </method>
<method name='AddTrack'> <method name='AddTrack'>
@ -26,7 +26,7 @@
</signal> </signal>
<signal name='TrackAdded'> <signal name='TrackAdded'>
<arg name='Metadata' type='a{sv}'> <arg name='Metadata' type='a{sv}'>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="TrackMetadata"/> <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="TrackMetadata"/>
</arg> </arg>
<arg name='AfterTrack' type='o'/> <arg name='AfterTrack' type='o'/>
</signal> </signal>
@ -36,7 +36,7 @@
<signal name='TrackMetadataChanged'> <signal name='TrackMetadataChanged'>
<arg name='TrackId' type='o'/> <arg name='TrackId' type='o'/>
<arg name='Metadata' type='a{sv}'> <arg name='Metadata' type='a{sv}'>
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="TrackMetadata"/> <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="TrackMetadata"/>
</arg> </arg>
</signal> </signal>
<property name='Tracks' type='ao' access='read'/> <property name='Tracks' type='ao' access='read'/>