Merge branch 'master' into sebas/kplugins

This commit is contained in:
Sebastian Kügler 2013-07-28 13:28:57 +02:00
commit 186fa2c181

View File

@ -114,11 +114,11 @@ set_package_properties(QCA2 PROPERTIES DESCRIPTION "Support for remote plasma wi
TYPE OPTIONAL TYPE OPTIONAL
) )
find_package(DBusMenuQt MODULE) #find_package(DBusMenuQt MODULE)
set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notification area menus via the DBusMenu protocol" #set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notification area menus via the DBusMenu protocol"
URL "https://launchpad.net/libdbusmenu-qt" #URL "https://launchpad.net/libdbusmenu-qt"
TYPE REQUIRED #TYPE REQUIRED
) #)
# TODO remove it in future # TODO remove it in future
find_package(LibAttica NO_MODULE) find_package(LibAttica NO_MODULE)