Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 802828 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-1 / +8 lines)
Lines 21-30 Link Here
21
set(CMAKE_AUTOUIC ON)
21
set(CMAKE_AUTOUIC ON)
22
set(QT_MINIMUM_VERSION "5.12.0")
22
set(QT_MINIMUM_VERSION "5.12.0")
23
23
24
option(DISABLE_DBUS "disable D-Bus support (global menu and D-Bus tray icon implementation)" OFF)
24
25
25
ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x050C00 -DUSE_WIDGETS)
26
ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x050C00 -DUSE_WIDGETS)
26
27
27
find_package(Qt5 ${QT_MINIMUM_VERSION} COMPONENTS Widgets Concurrent LinguistTools DBus ThemeSupport REQUIRED)
28
if(NOT ${DISABLE_DBUS})
29
    find_package(Qt5 ${QT_MINIMUM_VERSION} COMPONENTS Widgets Concurrent LinguistTools DBus ThemeSupport REQUIRED)
30
    message("D-Bus support: Enabled")
31
else()
32
    find_package(Qt5 ${QT_MINIMUM_VERSION} COMPONENTS Widgets Concurrent LinguistTools REQUIRED)
33
    message("D-Bus support: Disabled")
34
endif()
28
find_package(Qt5Gui ${QT_MINIMUM_VERSION} CONFIG REQUIRED Private)
35
find_package(Qt5Gui ${QT_MINIMUM_VERSION} CONFIG REQUIRED Private)
29
36
30
get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease IMPORTED_LOCATION)
37
get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease IMPORTED_LOCATION)
(-)a/src/qt5ct-qtplugin/CMakeLists.txt (-1 / +5 lines)
Lines 10-14 Link Here
10
10
11
add_library(qt5ct-qtplugin MODULE ${app_SRCS})
11
add_library(qt5ct-qtplugin MODULE ${app_SRCS})
12
set_target_properties(qt5ct-qtplugin PROPERTIES OUTPUT_NAME qt5ct)
12
set_target_properties(qt5ct-qtplugin PROPERTIES OUTPUT_NAME qt5ct)
13
target_link_libraries(qt5ct-qtplugin PRIVATE Qt5::Widgets Qt5::GuiPrivate Qt5::DBus Qt5::ThemeSupportPrivate)
13
if(NOT ${DISABLE_DBUS})
14
    target_link_libraries(qt5ct-qtplugin PRIVATE Qt5::Widgets Qt5::GuiPrivate Qt5::DBus Qt5::ThemeSupportPrivate)
15
else()
16
    target_link_libraries(qt5ct-qtplugin PRIVATE Qt5::Widgets Qt5::GuiPrivate)
17
endif()
14
install(TARGETS qt5ct-qtplugin DESTINATION ${PLUGINDIR}/platformthemes)
18
install(TARGETS qt5ct-qtplugin DESTINATION ${PLUGINDIR}/platformthemes)

Return to bug 802828