[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [cantor/frameworks] /: Help panel plugin ported
From:       Filipe Saraiva <filipe () kde ! org>
Date:       2014-11-01 14:21:04
Message-ID: E1XkZY8-0006dm-7L () scm ! kde ! org
[Download RAW message or body]

Git commit 32962cc295a7a4a41ef164072251887bdf904072 by Filipe Saraiva.
Committed on 01/11/2014 at 14:10.
Pushed by filipesaraiva into branch 'frameworks'.

Help panel plugin ported
Put ECM require back to 1.1.0 version

M  +1    -1    CMakeLists.txt
M  +1    -1    src/CMakeLists.txt
M  +1    -1    src/panelplugins/CMakeLists.txt
M  +2    -0    src/panelplugins/helppanel/helppanelplugin.cpp

http://commits.kde.org/cantor/32962cc295a7a4a41ef164072251887bdf904072

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7744d47..58c1001 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 =

 add_definitions(-DMAKE_CANTORLIBS_LIB)
 =

-find_package(ECM 1.3.0 REQUIRED CONFIG)
+find_package(ECM 1.1.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${cantor_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ${EC=
M_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

 find_package(Qt5 CONFIG REQUIRED
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1740de..23203d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ endif(LIBSPECTRE_FOUND)
 add_subdirectory(backends)
 #add_subdirectory(assistants)
 add_subdirectory(xslt)
-#add_subdirectory(panelplugins)
+add_subdirectory(panelplugins)
 =

 =

 #build the config object in a separate library, shared between shell and p=
art
diff --git a/src/panelplugins/CMakeLists.txt b/src/panelplugins/CMakeLists.=
txt
index 6af7a48..2c27b83 100644
--- a/src/panelplugins/CMakeLists.txt
+++ b/src/panelplugins/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(helppanel)
-add_subdirectory(variablemgr)
+# add_subdirectory(variablemgr)
diff --git a/src/panelplugins/helppanel/helppanelplugin.cpp b/src/panelplug=
ins/helppanel/helppanelplugin.cpp
index ca108eb..4611576 100644
--- a/src/panelplugins/helppanel/helppanelplugin.cpp
+++ b/src/panelplugins/helppanel/helppanelplugin.cpp
@@ -71,3 +71,5 @@ void HelpPanelPlugin::showHelp(const QString& help)
 =

 =

 K_EXPORT_CANTOR_PLUGIN(helppanelplugin, HelpPanelPlugin)
+
+#include "helppanelplugin.moc"

[prev in list] [next in list] [prev in thread] [next in thread]