forked from github_mirror/framelesshelper
parent
578458f35d
commit
fde00ab7ea
|
@ -97,8 +97,17 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
|
|||
)
|
||||
|
||||
if(MSVC)
|
||||
set(_WIN32_WINNT_WIN10 0x0A00)
|
||||
set(NTDDI_WIN10_CO 0x0A00000B)
|
||||
target_compile_definitions(${PROJECT_NAME} PRIVATE
|
||||
_CRT_NON_CONFORMING_SWPRINTFS _CRT_SECURE_NO_WARNINGS
|
||||
_ENABLE_EXTENDED_ALIGNED_STORAGE NOMINMAX UNICODE
|
||||
_UNICODE WIN32_LEAN_AND_MEAN WINRT_LEAN_AND_MEAN _DWMAPI_
|
||||
WINVER=${_WIN32_WINNT_WIN10} _WIN32_WINNT=${_WIN32_WINNT_WIN10}
|
||||
_WIN32_IE=${_WIN32_WINNT_WIN10} NTDDI_VERSION=${NTDDI_WIN10_CO}
|
||||
)
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE
|
||||
/W4 /WX
|
||||
/utf-8 /W4 /WX
|
||||
)
|
||||
else()
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE
|
||||
|
|
|
@ -58,23 +58,19 @@
|
|||
# define NTDDI_WIN10_CO 0x0A00000B
|
||||
#endif
|
||||
|
||||
#ifdef WINVER
|
||||
# undef WINVER
|
||||
#ifndef WINVER
|
||||
# define WINVER _WIN32_WINNT_WIN10
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32_WINNT
|
||||
# undef _WIN32_WINNT
|
||||
#ifndef _WIN32_WINNT
|
||||
# define _WIN32_WINNT _WIN32_WINNT_WIN10
|
||||
#endif
|
||||
|
||||
#ifdef NTDDI_VERSION
|
||||
# undef NTDDI_VERSION
|
||||
#ifndef NTDDI_VERSION
|
||||
# define NTDDI_VERSION NTDDI_WIN10_CO
|
||||
#endif
|
||||
|
||||
#define WINVER _WIN32_WINNT_WIN10
|
||||
#define _WIN32_WINNT _WIN32_WINNT_WIN10
|
||||
#define NTDDI_VERSION NTDDI_WIN10_CO
|
||||
|
||||
#include <QtCore/qt_windows.h>
|
||||
#include <windows.h>
|
||||
#include <uxtheme.h>
|
||||
#include <shellapi.h>
|
||||
#include <dwmapi.h>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "framelesswindowsmanager.h"
|
||||
#include "utilities.h"
|
||||
#ifdef Q_OS_WINDOWS
|
||||
# include <QtCore/qt_windows.h>
|
||||
# include "framelesshelper_windows.h"
|
||||
#endif
|
||||
|
||||
FRAMELESSHELPER_BEGIN_NAMESPACE
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
#else // QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||
#include <QtCore/qpair.h>
|
||||
#include <QtCore/qstring.h>
|
||||
#include <QtCore/qt_windows.h>
|
||||
#include "framelesshelper_windows.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
Loading…
Reference in New Issue