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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KManagerSelection to kwindowsystem framework
From:       David Faure <faure+bluesystems () kde ! org>
Date:       2012-11-30 22:12:39
Message-ID: 20121130221239.7AB59A60C4 () git ! kde ! org
[Download RAW message or body]

Git commit fd858f794eaa2685845301fc2d5160cb824b7533 by David Faure.
Committed on 30/11/2012 at 19:37.
Pushed by dfaure into branch 'frameworks'.

Move KManagerSelection to kwindowsystem framework

M  +0    -2    kdeui/CMakeLists.txt
M  +5    -2    tier1/kwindowsystem/src/CMakeLists.txt
R  +0    -0    tier1/kwindowsystem/src/kmanagerselection.cpp [from: kdeui/u=
til/kmanagerselection.cpp - 100% similarity]
R  +0    -0    tier1/kwindowsystem/src/kmanagerselection.h [from: kdeui/uti=
l/kmanagerselection.h - 100% similarity]

http://commits.kde.org/kdelibs/fd858f794eaa2685845301fc2d5160cb824b7533

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 2fe3901..4ef85ba 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -336,7 +336,6 @@ endif(NOT WINCE)
 =

 if (X11_FOUND)
     set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kkeyserver_x11.cpp
-                                         util/kmanagerselection.cpp
                                          util/kxerrorhandler.cpp
                                          dialogs/kcupsoptionswidget_p.cpp
                                          dialogs/kcupsoptionsjobwidget_p.c=
pp
@@ -581,7 +580,6 @@ install( FILES
  util/kcrash.h
  util/kcursor.h
  util/kkeyserver.h
- util/kmanagerselection.h
  util/kmodifierkeyinfo.h
  util/kpassivepopup.h
  util/kpassivepopupmessagehandler.h
diff --git a/tier1/kwindowsystem/src/CMakeLists.txt b/tier1/kwindowsystem/s=
rc/CMakeLists.txt
index c3764e9..5379a4f 100644
--- a/tier1/kwindowsystem/src/CMakeLists.txt
+++ b/tier1/kwindowsystem/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 =

 find_package(X11)
+find_package(XCB)
 =

 if (X11_FOUND)
    set (HAVE_X11 1)
@@ -39,10 +40,11 @@ endif()
 set(platformLinkLibraries)
 =

 if (HAVE_X11)
-   set(platformLinkLibraries ${X11_LIBRARIES} ${X11_Xfixes_LIB} ${X11_Xren=
der_LIB} ${kdeqt5staging_LIBRARY})
+   set(platformLinkLibraries ${X11_LIBRARIES} ${X11_Xfixes_LIB} ${X11_Xren=
der_LIB} ${XCB_XCB_LIBRARIES})
    set(kwindowsystem_SRCS ${kwindowsystem_SRCS} kwindowsystem_x11.cpp
                                                 kwindowinfo_x11.cpp
                                                 kxmessages.cpp
+                                                kmanagerselection.cpp
                                                 netwm.cpp )
 endif ()
 =

@@ -59,7 +61,7 @@ endif ()
 add_library(kwindowsystem ${kwindowsystem_SRCS})
 generate_export_header(kwindowsystem)
 =

-target_link_libraries(kwindowsystem ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRAR=
Y} ${QT_QTDBUS_LIBRARY} ${platformLinkLibraries} ${qt5CompatLib})
+target_link_libraries(kwindowsystem ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRAR=
Y} ${QT_QTDBUS_LIBRARY} ${kdeqt5staging_LIBRARY} ${platformLinkLibraries} $=
{qt5CompatLib})
 =

 set_target_properties(kwindowsystem PROPERTIES VERSION   ${KWINDOWSYSTEM_V=
ERSION_STRING}
                                                SOVERSION ${KWINDOWSYSTEM_S=
OVERSION})
@@ -72,6 +74,7 @@ install( FILES
    kwindowinfo.h
    kwindowsystem.h
    kxmessages.h
+   kmanagerselection.h
    netwm_def.h
    netwm.h
 =

diff --git a/kdeui/util/kmanagerselection.cpp b/tier1/kwindowsystem/src/kma=
nagerselection.cpp
similarity index 100%
rename from kdeui/util/kmanagerselection.cpp
rename to tier1/kwindowsystem/src/kmanagerselection.cpp
diff --git a/kdeui/util/kmanagerselection.h b/tier1/kwindowsystem/src/kmana=
gerselection.h
similarity index 100%
rename from kdeui/util/kmanagerselection.h
rename to tier1/kwindowsystem/src/kmanagerselection.h

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