mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-24 02:42:50 +00:00
plasma: cleanup systemtray applet build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
782c7257a1
commit
0c36703866
4 changed files with 5 additions and 21 deletions
|
@ -2,8 +2,10 @@ project(plasma-systemtray)
|
|||
|
||||
set(data_install_dir "plasma/packages/org.kde.systemtray")
|
||||
|
||||
set(systemtray_SRCS
|
||||
cmake_policy(SET CMP0005 NEW)
|
||||
add_definitions(-DSYSTEMTRAY_DATA_INSTALL_DIR="${data_install_dir}")
|
||||
|
||||
set(systemtray_SRCS
|
||||
core/manager.cpp
|
||||
core/protocol.cpp
|
||||
core/task.cpp
|
||||
|
@ -27,19 +29,8 @@ set(systemtray_SRCS
|
|||
ui/applet.cpp
|
||||
ui/widgetitem.cpp
|
||||
ui/mouseredirectarea.cpp
|
||||
|
||||
ui/autohide.ui
|
||||
ui/visibleitems.ui
|
||||
)
|
||||
|
||||
include(${QT_USE_FILE})
|
||||
include (CheckLibraryExists)
|
||||
check_library_exists (Xss XScreenSaverQueryInfo "" HAVE_LIBXSS)
|
||||
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||
IF (HAVE_LIBXSS)
|
||||
SET (IDLE_DETECTION_LIB "Xss")
|
||||
ENDIF (HAVE_LIBXSS)
|
||||
|
||||
kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS})
|
||||
include_directories(${CMAKE_SOURCE_DIR})
|
||||
target_link_libraries(plasma_applet_systemtray
|
||||
|
@ -51,8 +42,6 @@ target_link_libraries(plasma_applet_systemtray
|
|||
${X11_Xfixes_LIB}
|
||||
${X11_Xdamage_LIB}
|
||||
${X11_Xcomposite_LIB}
|
||||
${KDE4_SOLID_LIBS}
|
||||
${IDLE_DETECTION_LIB}
|
||||
)
|
||||
|
||||
install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
#cmakedefine HAVE_LIBXSS
|
||||
|
||||
// Path to directory containing qml stuff for systemtray
|
||||
#define SYSTEMTRAY_DATA_INSTALL_DIR "${data_install_dir}"
|
|
@ -212,10 +212,11 @@ void FdoGraphicsWidget::handleClientError(QX11EmbedContainer::Error error)
|
|||
|
||||
void FdoGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
|
||||
{
|
||||
Q_UNUSED(event);
|
||||
|
||||
if (d->widget) {
|
||||
d->widget.data()->resize(size().toSize());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -52,8 +52,6 @@
|
|||
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "../core/manager.h"
|
||||
|
||||
static const bool DEFAULT_SHOW_APPS = true;
|
||||
|
|
Loading…
Add table
Reference in a new issue