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

List:       kde-commits
Subject:    KDE/kdebase
From:       David Faure <faure () kde ! org>
Date:       2006-11-29 0:02:17
Message-ID: 1164758537.956462.21859.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 608944 by dfaure:

Next monday kdecore won't link to qt3support anymore; so link it explicitely in those two.


 M  +1 -1      runtime/kdesu/kdesud/CMakeLists.txt  
 M  +2 -4      workspace/kcontrol/input/kapplymousetheme.cpp  
 M  +1 -1      workspace/kwin/data/CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/kdesu/kdesud/CMakeLists.txt #608943:608944
@@ -12,7 +12,7 @@
 
 kde4_add_executable(kdesud NOGUI ${kdesud_SRCS})
 
-target_link_libraries(kdesud ${KDE4_KDECORE_LIBS}  ${KDE4_KDESU_LIBS} )
+target_link_libraries(kdesud ${KDE4_KDECORE_LIBS} ${KDE4_KDESU_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
 
 if(KDE4_ENABLE_FPIE)
     macro_add_compile_flags(kdesud ${KDE4_CXX_FPIE_FLAGS})
--- trunk/KDE/kdebase/workspace/kcontrol/input/kapplymousetheme.cpp #608943:608944
@@ -22,9 +22,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <QX11Info>
 #include <stdlib.h>
@@ -39,7 +37,7 @@
 Display* QX11Info::display() { return dpy; }
 Qt::HANDLE QX11Info::appRootWindow(int) { return DefaultRootWindow( dpy ); }
 
-bool isEmpty( const char* str )
+static bool isEmpty( const char* str )
     {
     if( str == NULL )
         return true;
--- trunk/KDE/kdebase/workspace/kwin/data/CMakeLists.txt #608943:608944
@@ -8,7 +8,7 @@
 
 kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS})
 
-target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} )
+target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} ${QT_QT3SUPPORT_LIBRARY})
 
 install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/  )
 
[prev in list] [next in list] [prev in thread] [next in thread]