jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-28 00:42:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cleanup

Browse source
This commit is contained in:
tooomm 2026-08-11 06:59:41 +02:00
parent bbf2412157
commit 9c337394a1
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -130,7 +130,7 @@ if(UNIX)
endif() endif()
endif() endif()
endif() endif()
elseif(WIN32) # Windows, including 64 bit elseif(WIN32) # Windows (including 64bit)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE})
endif() endif()
@ -289,7 +289,7 @@ if(UNIX)
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
endif() endif()
endif() endif()
elseif(WIN32) # Windows, including 64 bit elseif(WIN32) # Windows (including 64bit)
set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR}) set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(x64)") if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(x64)")
set(TRICE_IS_64_BIT 1) set(TRICE_IS_64_BIT 1)

4
cmake/FindVCredistRuntime.cmake
View file

@ -7,9 +7,7 @@ if(WIN32) # Windows (including 64bit)
set(REDIST_ARCH x64) set(REDIST_ARCH x64)
endif() endif()
# <VS 2017 uses vcredist_ARCH.exe set(REDIST_FILE_NAMES vc_redist.${REDIST_ARCH}.exe)
# >=VS 2017 uses vc_redist.ARCH.exe
set(REDIST_FILE_NAMES vcredist_${REDIST_ARCH}.exe vc_redist.${REDIST_ARCH}.exe)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)

8
cockatrice/src/interface/widgets/tabs/tab_supervisor.h
View file

@ -21,6 +21,7 @@
#include <QAbstractButton> #include <QAbstractButton>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMap> #include <QMap>
#include <QProxyStyle>
#include <QTabWidget> #include <QTabWidget>
class TabCardArtRules; class TabCardArtRules;
@ -51,6 +52,13 @@ class ServerInfo_User;
class GameReplay; class GameReplay;
class DeckList; class DeckList;
class MacOSTabFixStyle : public QProxyStyle
{
Q_OBJECT
public:
QRect subElementRect(SubElement, const QStyleOption *, const QWidget *) const override;
};
class CloseButton : public QAbstractButton class CloseButton : public QAbstractButton
{ {
Q_OBJECT Q_OBJECT