summaryrefslogtreecommitdiffstats
path: root/kicker/applets
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:16:20 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:16:20 -0600
commitdc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch)
tree4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kicker/applets
parent1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff)
downloadtdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz
tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets')
-rw-r--r--kicker/applets/launcher/CMakeLists.txt2
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index dab1a8c95..bf5111658 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_add_kpart( launcher_panelapplet AUTOMOC
-Wl,--start-group
kicker_core-static kicker_buttons-static kicker_ui-static
-Wl,--end-group
- kickermain-shared kutils-shared kabc-shared
+ kickermain-shared tdeutils-shared kabc-shared
DEPENDENCIES libkicker-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 0eebec315..5b1ff44ca 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kstandarddirs.h>
#include <kdesktopfile.h>
#include <kglobalsettings.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
#include <kservice.h>
#include <kservicegroup.h>