[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[marble] src/plugins/render/navigation: No need for a KDE dependency here.



Git commit c421a2006656ba2f440d3caf561063134f8cd65d by Dennis Nienhüser.
Committed on 30/06/2013 at 13:08.
Pushed by nienhueser into branch 'master'.

No need for a KDE dependency here.

There is no Marble plugin with a KDE dependency anymore, so
marble-plugins can now (>= KDE 4.11 RC 1) be packaged without a kdecore
dependency. Please adjust packages accordingly if possible (makes most
sense for users interested in just marble-qt).
CCMAIL: maxy@debian.org
CCMAIL: debian-qt-kde@lists.debian.org

M  +2    -8    src/plugins/render/navigation/CMakeLists.txt

http://commits.kde.org/marble/c421a2006656ba2f440d3caf561063134f8cd65d

diff --git a/src/plugins/render/navigation/CMakeLists.txt b/src/plugins/render/navigation/CMakeLists.txt
index 2d2915c..b0597aa 100644
--- a/src/plugins/render/navigation/CMakeLists.txt
+++ b/src/plugins/render/navigation/CMakeLists.txt
@@ -11,13 +11,7 @@ set( navigation_SRCS NavigationFloatItem.cpp ArrowDiscWidget.cpp NavigationButto
 set (navigation_UI navigation.ui)
 
 qt4_add_resources(navigation_SRCS navigation.qrc)
-
-if (QTONLY)
-  qt4_wrap_ui(navigation_SRCS ${navigation_UI})
-  qt4_automoc(${navigation_SRCS})
-else (QTONLY)
-  include_directories (${KDE4_INCLUDES})
-  kde4_add_ui_files(navigation_SRCS ${navigation_UI})
-endif (QTONLY)
+qt4_wrap_ui(navigation_SRCS ${navigation_UI})
+qt4_automoc(${navigation_SRCS})
 
 marble_add_plugin( NavigationFloatItem ${navigation_SRCS} )


Reply to: