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

List:       kde-commits
Subject:    [kde-workspace/farhad_hf/lockscreen] /: Merge branch 'master' into
From:       Farhad Hedayati Fard <hf.farhad () gmail ! com>
Date:       2011-07-27 17:37:14
Message-ID: 20110727173714.6B05CA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 3b0ed59f5d09f36e8856557461ebb297fa320221 by Farhad Hedayati Fard.
Committed on 27/07/2011 at 19:24.
Pushed by hedayatifard into branch 'farhad_hf/lockscreen'.

Merge branch 'master' into farhad_hf/lockscreen

Conflicts:
	kwin/CMakeLists.txt

M  +15   -1    kwin/workspace.h
M  +49   -31   kwin/CMakeLists.txt
M  +0    -3    krunner/krunnerapp.h
M  +0    -1    krunner/krunnerapp.cpp
R  +1    -1    kwin/screenlocker/lock/lockprocess.cc
R  +1    -1    kwin/screenlocker/lock/main.cc
R  +1    -1    kwin/screenlocker/lock/lockdlg.cc

http://commits.kde.org/kde-workspace/3b0ed59f5d09f36e8856557461ebb297fa320221

diff --cc krunner/krunnerapp.h
index b2b1306,284d581..456b3e0
--- a/krunner/krunnerapp.h
+++ b/krunner/krunnerapp.h
@@@ -19,9 -19,10 +19,7 @@@
  #ifndef KRUNNERAPP_H
  #define KRUNNERAPP_H
  
- #include <kworkspace.h>
- 
  #include <kuniqueapplication.h>
 -#ifdef Q_WS_X11
 -#include "saverengine.h"
 -#endif
  
  class KActionCollection;
  class KDialog;
diff --cc kwin/CMakeLists.txt
index 98edc3b,2ef13e5..8621612
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@@ -213,72 -213,49 +224,72 @@@ qt4_add_dbus_interface( kwin_KDEINIT_SR
  
  qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
  
+ set(kwinLibs ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} kephal kworkspace kdecorations \
kwineffects ${X11_LIBRARIES}) + 
 +# SET_SOURCE_FILES_PROPERTIES(
 +#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
 +#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
 +#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
 +#      PROPERTIES GENERATED 1
 +# )
 +set (
 +     kwin_KDEINIT_SRCS
 +     ${kwin_KDEINIT_SRCS}
 +     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
 +     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
 +     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
 +)
 +
 +add_subdirectory( screenlocker )
- kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
 +
- SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/kscreensaveradaptor.h \
${CMAKE_CURRENT_BINARY_DIR}/screensaveradaptor.h \
                ${CMAKE_CURRENT_BINARY_DIR}/kscreensaversettings.h PROPERTIES \
                GENERATED 1)
- add_dependencies(kwin generated_saver_dbus)
 +
 +if(X11_Xss_LIB)
 +  target_link_libraries(kdeinit_kwin ${X11_Xss_LIB})
 +endif(X11_Xss_LIB)
 +
- target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} kephal \
                kworkspace kdecorations kwineffects ${X11_LIBRARIES})
- 
  if(KWIN_BUILD_SCRIPTING)
-     target_link_libraries(kdeinit_kwin ${QT_QTSCRIPT_LIBRARY})
+     set(kwinLibs ${kwinLibs} ${QT_QTSCRIPT_LIBRARY})
  endif(KWIN_BUILD_SCRIPTING)
  
  if(KWIN_BUILD_TABBOX)
-     target_link_libraries(kdeinit_kwin ${QT_QTXML_LIBRARY})
+     set(kwinLibs ${kwinLibs} ${QT_QTXML_LIBRARY})
  endif(KWIN_BUILD_TABBOX)
  
- if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
-   add_subdirectory(opengltest)
-   target_link_libraries(kdeinit_kwin ${OPENGL_gl_LIBRARY})
-   # -ldl used by OpenGL code
-   find_library(DL_LIBRARY dl)
-   if (DL_LIBRARY)
-     target_link_libraries(kdeinit_kwin ${DL_LIBRARY})
-   endif(DL_LIBRARY)
-   # must be after opengl, to be initialized first by the linker
-   target_link_libraries(kdeinit_kwin kwinnvidiahack)
- endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
- 
- if(KWIN_HAVE_OPENGLES_COMPOSITING)
-   target_link_libraries(kdeinit_kwin ${OPENGLES_LIBRARIES} \
                ${OPENGLES_EGL_LIBRARIES})
- endif(KWIN_HAVE_OPENGLES_COMPOSITING)
- 
  if (X11_Xrandr_FOUND)
-   target_link_libraries(kdeinit_kwin ${X11_Xrandr_LIB})
+   set(kwinLibs ${kwinLibs} ${X11_Xrandr_LIB})
  endif (X11_Xrandr_FOUND)
  if (X11_Xcomposite_FOUND)
-   target_link_libraries(kdeinit_kwin ${X11_Xcomposite_LIB})
+   set(kwinLibs ${kwinLibs} ${X11_Xcomposite_LIB})
  endif (X11_Xcomposite_FOUND)
  if (X11_Xdamage_FOUND)
-   target_link_libraries(kdeinit_kwin ${X11_Xdamage_LIB})
+   set(kwinLibs ${kwinLibs} ${X11_Xdamage_LIB})
  endif (X11_Xdamage_FOUND)
  if (X11_Xrender_FOUND)
-   target_link_libraries(kdeinit_kwin ${X11_Xrender_LIB})
+   set(kwinLibs ${kwinLibs} ${X11_Xrender_LIB})
  endif (X11_Xrender_FOUND)
  if (X11_Xfixes_FOUND)
-   target_link_libraries(kdeinit_kwin ${X11_Xfixes_LIB})
+   set(kwinLibs ${kwinLibs} ${X11_Xfixes_LIB})
  endif (X11_Xfixes_FOUND)
  
+ kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
++SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/kscreensaveradaptor.h \
${CMAKE_CURRENT_BINARY_DIR}/screensaveradaptor.h \
${CMAKE_CURRENT_BINARY_DIR}/kscreensaversettings.h PROPERTIES GENERATED 1) \
++add_dependencies(kwin generated_saver_dbus) + 
+ target_link_libraries(kdeinit_kwin ${kwinLibs})
+ 
+ if(OPENGL_FOUND)
+   set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
+   add_subdirectory(opengltest)
+   target_link_libraries(kdeinit_kwin kwinglutils ${OPENGL_gl_LIBRARY})
+   # -ldl used by OpenGL code
+   find_library(DL_LIBRARY dl)
+   if (DL_LIBRARY)
+     target_link_libraries(kdeinit_kwin ${DL_LIBRARY})
+   endif(DL_LIBRARY)
+   # must be after opengl, to be initialized first by the linker
+   target_link_libraries(kdeinit_kwin kwinnvidiahack)
+ endif(OPENGL_FOUND)
+ 
  install(TARGETS kdeinit_kwin ${INSTALL_TARGETS_DEFAULT_ARGS} )
  install(TARGETS kwin         ${INSTALL_TARGETS_DEFAULT_ARGS} )
  


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