mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-31 11:35:24 +01:00
Don't include qtwin on non-windows os. Thanks oget. Fixes issue #798
This commit is contained in:
parent
4f943795bc
commit
1ce8ba2abf
@ -206,7 +206,9 @@ endif (USE_SYSTEM_QXT)
|
||||
|
||||
# Subdirectories
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(3rdparty/qtwin)
|
||||
if (WIN32)
|
||||
add_subdirectory(3rdparty/qtwin)
|
||||
endif (WIN32)
|
||||
add_subdirectory(3rdparty/universalchardet)
|
||||
add_subdirectory(tests)
|
||||
add_subdirectory(dist)
|
||||
|
@ -6,7 +6,9 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare ${CMAKE_CXX_FL
|
||||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include_directories(${SPARKLE})
|
||||
include_directories(../3rdparty/gmock/gtest/include)
|
||||
include_directories(../3rdparty/qtwin)
|
||||
if(WIN32)
|
||||
include_directories(../3rdparty/qtwin)
|
||||
endif(WIN32)
|
||||
|
||||
include_directories(${GLIB_INCLUDE_DIRS})
|
||||
include_directories(${LIBXML_INCLUDE_DIRS})
|
||||
@ -653,7 +655,6 @@ add_library(clementine_lib STATIC
|
||||
add_dependencies(clementine_lib pot)
|
||||
|
||||
target_link_libraries(clementine_lib
|
||||
qtwin
|
||||
chardet
|
||||
${GOBJECT_LIBRARIES}
|
||||
${GLIB_LIBRARIES}
|
||||
@ -719,6 +720,7 @@ if (WIN32)
|
||||
${ZLIB_LIBRARIES}
|
||||
${MSWMDM_LIBRARIES}
|
||||
${SAC_SHIM_LIBRARIES}
|
||||
qtwin
|
||||
)
|
||||
endif (WIN32)
|
||||
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include "osdpretty.h"
|
||||
#include "ui_osdpretty.h"
|
||||
|
||||
#include "qtwin.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QPainter>
|
||||
@ -36,6 +35,10 @@
|
||||
# include <QX11Info>
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
#include "qtwin.h"
|
||||
#endif
|
||||
|
||||
const char* OSDPretty::kSettingsGroup = "OSDPretty";
|
||||
|
||||
const int OSDPretty::kDropShadowSize = 13;
|
||||
@ -297,8 +300,10 @@ void OSDPretty::Reposition() {
|
||||
setMask(mask);
|
||||
}
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
// On windows, enable blurbehind on the masked area
|
||||
QtWin::enableBlurBehindWindow(this, true, QRegion(mask));
|
||||
#endif
|
||||
}
|
||||
|
||||
void OSDPretty::enterEvent(QEvent *) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user