[PATCH 1/3] Drop KDE_NO_PHONON, Phonon works on Qt5 now.

[David Faure]

Hi Jon,

What's the status on phonon-for-Qt5? If all changes got merged in, maybe this 
patch can be applied to kdelibs-frameworks?

Thanks!

On Sunday 07 October 2012 01:27:13 Jon Severinsson wrote:
> ---
>  CMakeLists.txt                                |   10 +---------
>  interfaces/CMakeLists.txt                     |    4 +---
>  knotify/config/knotifyconfigactionswidget.cpp |    2 --
>  3 filer ändrade, 2 tillägg(+), 14 borttagningar(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index e8f3ea0..a44727e 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -362,12 +362,6 @@ endif(STATIC_LIBRARY)
>  configure_file(config-prefix.h.cmake
> ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
> configure_file(config-compiler.h.cmake
> ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
> 
> -# TODO: Port away from this:
> -if (QT5_BUILD)
> -  add_definitions(-DKDE_NO_PHONON)
> -  set(KDE_NO_PHONON True)
> -endif()
> -
>  # Needed for the calls to kconfig_add_kcfg_files in some modules
>  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
> "${CMAKE_SOURCE_DIR}/tier2/kconfig/cmake") set(KCONFIG_KCFGC_EXECUTABLE
> kconfig_compiler)
> @@ -407,9 +401,7 @@ endif(NOT WINCE)
>  add_subdirectory( kioslave   )
>  add_subdirectory( kparts     )
>  add_subdirectory( kunitconversion )
> -if(NOT KDE_NO_PHONON)
> -    add_subdirectory( khtml  )
> -endif()
> +add_subdirectory( khtml  )
>  add_subdirectory( interfaces  )
>  if (NOT QT5_BUILD) # TODO: Qt5UiTools_FOUND
>      add_subdirectory( kross )
> diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
> index d496d01..1e0eff1 100644
> --- a/interfaces/CMakeLists.txt
> +++ b/interfaces/CMakeLists.txt
> @@ -3,9 +3,7 @@
>  project(interfaces)
> 
>  add_subdirectory( kregexpeditor )
> -if (NOT KDE_NO_PHONON)
> -  add_subdirectory( kmediaplayer )
> -endif()
> +add_subdirectory( kmediaplayer )
>  add_subdirectory( kio )
>  add_subdirectory( terminal )
>  add_subdirectory( khexedit )
> diff --git a/knotify/config/knotifyconfigactionswidget.cpp
> b/knotify/config/knotifyconfigactionswidget.cpp index de892fe..5791c62
> 100644
> --- a/knotify/config/knotifyconfigactionswidget.cpp
> +++ b/knotify/config/knotifyconfigactionswidget.cpp
> @@ -134,11 +134,9 @@ void KNotifyConfigActionsWidget::slotPlay(  )
>            if ( search.isEmpty() )*/
>          soundURL = QUrl::fromLocalFile(KStandardDirs::locate("sound",
> soundString)); }
> -#ifndef KDE_NO_PHONON
>  	Phonon::MediaObject* media = Phonon::createPlayer(
> Phonon::NotificationCategory, soundURL ); media->play();
>  	connect(media, SIGNAL(finished()), media, SLOT(deleteLater()));
> -#endif
>  }
> 
>  void KNotifyConfigActionsWidget::slotKTTSComboChanged()
-- 
David Faure, faure at kde.org, http://www.davidfaure.fr
Working on KDE, in particular KDE Frameworks 5