[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: KF5 - Q_OS_* not defined
From: Albert Astals Cid <tsdgeos () terra ! es>
Date: 2013-02-07 22:40:16
Message-ID: 20130207224016.C685DA6091 () git ! kde ! org
[Download RAW message or body]
Git commit b5767214c579a69d0c6fd72fbed10ff93286502a by Albert Astals Cid, o=
n behalf of Andrius da Costa Ribas.
Committed on 07/02/2013 at 23:39.
Pushed by aacid into branch 'frameworks'.
KF5 - Q_OS_* not defined
Acked by dfaure
REVIEW: 105868
M +2 -2 kde3support/KDE3SupportMacros.cmake
M +3 -1 kdecore/CMakeLists.txt
M +2 -2 kded/CMakeLists.txt
M +16 -16 kdeui/CMakeLists.txt
M +1 -1 kdeui/KDEUIMacros.cmake
M +3 -3 kinit/CMakeLists.txt
M +2 -2 tier1/kidletime/src/CMakeLists.txt
M +2 -2 tier1/kwindowsystem/src/CMakeLists.txt
http://commits.kde.org/kdelibs/b5767214c579a69d0c6fd72fbed10ff93286502a
diff --git a/kde3support/KDE3SupportMacros.cmake b/kde3support/KDE3SupportM=
acros.cmake
index a4f44e2..c9e47c2 100644
--- a/kde3support/KDE3SupportMacros.cmake
+++ b/kde3support/KDE3SupportMacros.cmake
@@ -20,9 +20,9 @@ macro (_KDE4_GET_MOC_FLAGS _moc_flags)
set(${_moc_flags} ${${_moc_flags}} "-D${_current}")
endforeach(_current ${_defines})
=
- if(Q_OS_WIN)
+ if(WIN32)
set(${_moc_flags} ${${_moc_flags}} -DWIN32)
- endif(Q_OS_WIN)
+ endif(WIN32)
=
# if Qt is installed only as framework, add -F /library/Frameworks to t=
he moc arguments
# otherwise moc can't find the headers in the framework include dirs
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 0fddfd7..c5f8488 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -1,5 +1,7 @@
project(kdecore)
=
+find_package(X11)
+
# Generate config-kstandarddirs.h
set( KDELIBSUFF ${LIB_SUFFIX} )
configure_file(config-kstandarddirs.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/co=
nfig-kstandarddirs.h )
@@ -198,7 +200,7 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
${kdecore_OPTIONAL_SRCS}
)
=
-if (NOT Q_OS_X11)
+if (NOT HAVE_X11)
add_definitions(-DNO_DISPLAY)
endif()
=
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 157dc36..7421b48 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -27,11 +27,11 @@ set(kded_KDEINIT_SRCS kded.cpp kdedadaptor.cpp
=
kde4_add_kdeinit_executable(kded5 ${kded_KDEINIT_SRCS})
=
-if (Q_OS_MAC)
+if (APPLE)
set_target_properties(kded5 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAK=
E_CURRENT_SOURCE_DIR}/Info.plist.template)
set_target_properties(kded5 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "o=
rg.kded.kded5")
set_target_properties(kded5 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE =
Daemon")
-endif (Q_OS_MAC)
+endif (APPLE)
=
target_link_libraries(kdeinit_kded5 ${KDE4_KIO_LIBS} ${X11_LIBRARIES} kco=
readdons kdbusaddons ki18n)
=
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 1f18a91..4210979 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -303,14 +303,14 @@ endif(NOT KDE_NO_DEPRECATED)
=
option(MAC_USE_OSXKEYCHAIN "On OS X, use the keychain as backend for kwall=
et, instead of kwalletd.")
=
-if (Q_OS_MAC AND MAC_USE_OSXKEYCHAIN)
+if (APPLE AND MAC_USE_OSXKEYCHAIN)
FIND_LIBRARY(SECURITY_LIBRARY Security)
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp)
-else(Q_OS_MAC AND MAC_USE_OSXKEYCHAIN)
+else(APPLE AND MAC_USE_OSXKEYCHAIN)
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
-else(Q_OS_MAC AND MAC_USE_OSXKEYCHAIN)
+else(APPLE AND MAC_USE_OSXKEYCHAIN)
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
-endif(Q_OS_MAC AND MAC_USE_OSXKEYCHAIN)
+endif(APPLE AND MAC_USE_OSXKEYCHAIN)
=
if(NOT WINCE)
set(kdeui_LIB_SRCS
@@ -331,12 +331,12 @@ if (X11_FOUND)
dialogs/kcupsoptionspageswidget_p=
.cpp
dialogs/kcupsoptionssettingswidge=
t_p.cpp )
endif (X11_FOUND)
-if (Q_OS_MAC)
+if (APPLE)
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kkeyserver_mac.cpp )
-endif (Q_OS_MAC)
-if (Q_OS_WIN)
+endif (APPLE)
+if (WIN32)
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kkeyserver_win.cpp )
-endif (Q_OS_WIN)
+endif (WIN32)
=
message("Port to Qt5 native filter")
#if (X11_FOUND AND X11_Xkb_FOUND)
@@ -418,12 +418,12 @@ if(MINGW)
target_link_libraries(kdeui gdi32 oleaut32)
endif(MINGW)
=
-if(Q_OS_MAC)
+if(APPLE)
target_link_libraries(kdeui ${CARBON_LIBRARY})
if (MAC_USE_OSXKEYCHAIN)
target_link_libraries(kdeui ${SECURITY_LIBRARY})
endif (MAC_USE_OSXKEYCHAIN)
-endif(Q_OS_MAC)
+endif(APPLE)
=
if(X11_XTest_FOUND)
target_link_libraries(kdeui ${X11_XTest_LIB})
@@ -454,13 +454,13 @@ set_target_properties(kdeui PROPERTIES VERSION ${KDE_=
NON_GENERIC_LIB_VERSION}
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAU=
LT_ARGS})
########### install files ###############
=
-if (Q_OS_MAC)
+if (APPLE)
install( FILES util/kkeyserver_mac.h DESTINATION ${INCLUDE_INSTALL_DIR}=
COMPONENT Devel)
-elseif (Q_OS_WIN)
+elseif (WIN32)
install( FILES util/kkeyserver_win.h DESTINATION ${INCLUDE_INSTALL_DIR=
} COMPONENT Devel )
-else(Q_OS_WIN)
+else(WIN32)
install( FILES util/fixx11h.h util/kkeyserver_x11.h DESTINATION ${INCLU=
DE_INSTALL_DIR} COMPONENT Devel)
-endif (Q_OS_MAC)
+endif (APPLE)
=
install( FILES
dialogs/aboutkde.png
@@ -637,9 +637,9 @@ install( FILES
=
install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} )
=
-if (Q_OS_MAC)
+if (APPLE)
install(PROGRAMS kernel/start-session-bus.sh DESTINATION ${BIN_INSTALL_D=
IR} )
-endif (Q_OS_MAC)
+endif (APPLE)
=
install( FILES
jobs/org.kde.JobViewServer.xml
diff --git a/kdeui/KDEUIMacros.cmake b/kdeui/KDEUIMacros.cmake
index d5c20d9..1e80e38 100644
--- a/kdeui/KDEUIMacros.cmake
+++ b/kdeui/KDEUIMacros.cmake
@@ -258,7 +258,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
message(STATUS "Unable to find the png2ico utility - applicati=
on will not have an application icon!")
endif(PNG2ICO_EXECUTABLE)
endif(WIN32)
- if (Q_OS_MAC)
+ if (APPLE)
# first convert image to a tiff using the Mac OS X "sips" utility,
# then use tiff2icns to convert to an icon
find_program(SIPS_EXECUTABLE NAMES sips)
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 05dc413..0c0ca45 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -37,15 +37,15 @@ endif (WIN32)
=
# on win32 kdeinit5 has to be a console application =
# to be able to catch stderr based --verbose output
-if (Q_OS_MAC)
+if (APPLE)
# this has to be GUI on OSX because it launches GUI apps and need a quar=
tz context
kde4_add_executable(kdeinit5 ${kdeinit_SRCS})
set_target_properties(kdeinit5 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMA=
KE_CURRENT_SOURCE_DIR}/Info.plist.template)
set_target_properties(kdeinit5 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "=
org.kde.kdeinit5")
set_target_properties(kdeinit5 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE=
Init")
-else (Q_OS_MAC)
+else (APPLE)
kde4_add_executable(kdeinit5 NOGUI ${kdeinit_SRCS})
-endif (Q_OS_MAC)
+endif (APPLE)
=
target_link_libraries(kdeinit5 ${KDE4_KDEUI_LIBS} ${kdeinit_LIBS} ${KINIT_=
SOCKET_LIBRARY} kcoreaddons ki18n )
if (X11_FOUND)
diff --git a/tier1/kidletime/src/CMakeLists.txt b/tier1/kidletime/src/CMake=
Lists.txt
index 15c85be..de70741 100644
--- a/tier1/kidletime/src/CMakeLists.txt
+++ b/tier1/kidletime/src/CMakeLists.txt
@@ -43,9 +43,9 @@ if (X11_FOUND)
set(kidletime_LIBS ${kidletime_LIBS} ${X11_Xext_LIB} ${XCB_XCB_LIBRA=
RIES} ${X11_XCB_LIBRARIES} ${XCB_SYNC_LIBRARIES})
endif ()
set(kidletime_LIBS ${kidletime_LIBS} ${X11_LIBRARIES} ${kdeqt5staging_L=
IBRARY})
-elseif (Q_OS_MAC)
+elseif (APPLE)
set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS} macpoller.cpp)
-elseif (Q_OS_WIN)
+elseif (WIN32)
set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS} windowspoller.cpp)
endif (X11_FOUND)
=
diff --git a/tier1/kwindowsystem/src/CMakeLists.txt b/tier1/kwindowsystem/s=
rc/CMakeLists.txt
index 630e57c..7cce91d 100644
--- a/tier1/kwindowsystem/src/CMakeLists.txt
+++ b/tier1/kwindowsystem/src/CMakeLists.txt
@@ -48,12 +48,12 @@ if (HAVE_X11)
netwm.cpp )
endif ()
=
-if (Q_OS_MAC)
+if (APPLE)
set(kwindowsystem_SRCS ${kwindowsystem_SRCS} kwindowsystem_mac.cpp
kwindowinfo_mac.cpp)
endif ()
=
-if (Q_OS_WIN)
+if (WIN32)
set(kwindowsystem_SRCS ${kwindowsystem_SRCS} kwindowsystem_win.cpp
kwindowinfo_win.cpp)
endif ()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic