diff options
Diffstat (limited to 'kstyles/kthemestyle')
| -rw-r--r-- | kstyles/kthemestyle/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kstyles/kthemestyle/Makefile.am | 4 | ||||
| -rw-r--r-- | kstyles/kthemestyle/kthemestyle.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt index 45bdb0b68..ee6995f2d 100644 --- a/kstyles/kthemestyle/CMakeLists.txt +++ b/kstyles/kthemestyle/CMakeLists.txt @@ -16,9 +16,9 @@ add_definitions( include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared kdecore-shared dl + LINK tdefx-shared tdecore-shared dl DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/kthemestyle/Makefile.am b/kstyles/kthemestyle/Makefile.am index b2c3be33f..407ac1b2a 100644 --- a/kstyles/kthemestyle/Makefile.am +++ b/kstyles/kthemestyle/Makefile.am @@ -20,10 +20,10 @@ AM_CPPFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefx $(all_includes) noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h kde_style_LTLIBRARIES = kthemestyle.la kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kthemestyle_la_LIBADD = ../../kdefx/libtdefx.la ../../kdecore/libtdecore.la -ldl $(LIB_QT) +kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la ../../tdecore/libtdecore.la -ldl $(LIB_QT) kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp kthemestyle_la_METASOURCES = AUTO diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index ffd2ffda8..d986b0147 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -115,7 +115,7 @@ public: { #ifdef __GLIBC__ dlopen("kthemestyle.so",RTLD_LAZY); - //####### Keep reference count up so kdecore w. fast-malloc doesn't get unloaded + //####### Keep reference count up so tdecore w. fast-malloc doesn't get unloaded //####### (Fixes exit crashes with qt-only apps that occur on Linux) //####### This should be rethought after 3.0, //####### as it relies on the implementation-specific behavior |