diff options
| -rw-r--r-- | kinit/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kjs/global.h.in | 2 | ||||
| -rw-r--r-- | networkstatus/networkstatuscommon.cpp | 4 | ||||
| -rw-r--r-- | tdefx/kstyle.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index b2680ece0..fd1408918 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kparts-shared + LINK ltdlc-static kparts-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -100,7 +100,7 @@ set( target kioslave ) tde_add_executable( ${target} AUTOMOC SOURCES kioslave.cpp - LINK kio-shared + LINK ltdlc-static kio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 2c1d8ff0d..c89f33e99 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -66,6 +66,6 @@ tde_add_library( ${target} SHARED SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp VERSION 4.2.0 EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB} - LINK tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES} + LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kjs/global.h.in b/kjs/global.h.in index 571bc7c5e..bd8d46b81 100644 --- a/kjs/global.h.in +++ b/kjs/global.h.in @@ -34,7 +34,7 @@ #define KJS_PACKED #endif -#undef __KDE_HAVE_GCC_VISIBILITY +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 #ifdef __KDE_HAVE_GCC_VISIBILITY #define KJS_EXPORT __attribute__ ((visibility("default"))) diff --git a/networkstatus/networkstatuscommon.cpp b/networkstatus/networkstatuscommon.cpp index 409a9e4f2..b2a8cc8f1 100644 --- a/networkstatus/networkstatuscommon.cpp +++ b/networkstatus/networkstatuscommon.cpp @@ -22,7 +22,7 @@ #include "networkstatuscommon.h" #include <kdebug.h> -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) +KDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) { kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl; s << (int)p.status; @@ -33,7 +33,7 @@ TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p return s; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) +KDE_EXPORT TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) { int status, onDemandPolicy, internet; s >> status; diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index 419ae90ae..89d558496 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -2358,7 +2358,7 @@ void KStyle::virtual_hook( int, void* ) // HACK for gtk-qt-engine -KDE_EXPORT extern "C" +extern "C" KDE_EXPORT void kde_kstyle_set_scrollbar_type_windows( void* style ) { ((KStyle*)style)->setScrollBarType( KStyle::WindowsStyleScrollBar ); |