diff --git a/CMakeLists.txt b/CMakeLists.txt index 63fbb6a..7f4096b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -92,16 +92,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PROJECT_VERSION_COMMIT "UNKNOWN") # Get a git hash value. We do not want to use git command here # because we don't want to make git a build-time dependency. -if(EXISTS "${CMAKE_SOURCE_DIR}/.git/HEAD") - file(READ "${CMAKE_SOURCE_DIR}/.git/HEAD" PROJECT_VERSION_COMMIT) +if(EXISTS "${PROJECT_SOURCE_DIR}/.git/HEAD") + file(READ "${PROJECT_SOURCE_DIR}/.git/HEAD" PROJECT_VERSION_COMMIT) string(STRIP "${PROJECT_VERSION_COMMIT}" PROJECT_VERSION_COMMIT) if(PROJECT_VERSION_COMMIT MATCHES "^ref: (.*)") set(HEAD "${CMAKE_MATCH_1}") - if(EXISTS "${CMAKE_SOURCE_DIR}/.git/${HEAD}") - file(READ "${CMAKE_SOURCE_DIR}/.git/${HEAD}" PROJECT_VERSION_COMMIT) + if(EXISTS "${PROJECT_SOURCE_DIR}/.git/${HEAD}") + file(READ "${PROJECT_SOURCE_DIR}/.git/${HEAD}" PROJECT_VERSION_COMMIT) string(STRIP "${PROJECT_VERSION_COMMIT}" PROJECT_VERSION_COMMIT) else() - file(READ "${CMAKE_SOURCE_DIR}/.git/packed-refs" PACKED_REFS) + file(READ "${PROJECT_SOURCE_DIR}/.git/packed-refs" PACKED_REFS) string(REGEX REPLACE ".*\n([0-9a-f]+) ${HEAD}\n.*" "\\1" PROJECT_VERSION_COMMIT "\n${PACKED_REFS}") endif() endif() @@ -120,6 +120,15 @@ if(MSVC) string(REGEX REPLACE "[-|/]Ob[0|1|2|3] " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) string(APPEND CMAKE_CXX_FLAGS_RELEASE " /Ob3 ") endif() + if(NOT DEFINED FRAMELESSHELPER_ENABLE_VCLTL) + set(FRAMELESSHELPER_ENABLE_VCLTL OFF) + endif() + if(FRAMELESSHELPER_ENABLE_VCLTL) + include(src/core/VC-LTL.cmake) + if("x${SupportLTL}" STREQUAL "xtrue") + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" CACHE STRING "" FORCE) + endif() + endif() endif() find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui) diff --git a/FramelessHelperConfig.cmake.in b/FramelessHelperConfig.cmake.in index dffe6f5..677781c 100644 --- a/FramelessHelperConfig.cmake.in +++ b/FramelessHelperConfig.cmake.in @@ -1,3 +1,27 @@ +#[[ + MIT License + + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +]] + @PACKAGE_INIT@ set(_@PROJECT_NAME@_supported_components Core Widgets Quick) diff --git a/LICENSE b/LICENSE index 3f8cacc..b6ae6bf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) +Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a95a093..b0fbb0a 100644 --- a/README.md +++ b/README.md @@ -367,7 +367,7 @@ Short answer: it's impossible. Full explaination: of course we can use the same ```text MIT License -Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) +Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -387,3 +387,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +## Third-party notices + +This library uses [**Micon**](https://github.com/xtoolkit/Micon) as the fallback icon font on Windows 7, Windows 8, Windows 8.1, Linux and macOS. +It's licensed under the [**MIT license**](http://opensource.org/licenses/MIT). diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3777976..c768457 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/dialog/CMakeLists.txt b/examples/dialog/CMakeLists.txt index 8b166e2..cd62aee 100644 --- a/examples/dialog/CMakeLists.txt +++ b/examples/dialog/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/dialog/main.cpp b/examples/dialog/main.cpp index b58497d..3dfea6c 100644 --- a/examples/dialog/main.cpp +++ b/examples/dialog/main.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt index 9524931..fb1212b 100644 --- a/examples/mainwindow/CMakeLists.txt +++ b/examples/mainwindow/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/mainwindow/main.cpp b/examples/mainwindow/main.cpp index 62d124d..66dafe7 100644 --- a/examples/mainwindow/main.cpp +++ b/examples/mainwindow/main.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp index de30cf6..92235b0 100644 --- a/examples/mainwindow/mainwindow.cpp +++ b/examples/mainwindow/mainwindow.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/mainwindow/mainwindow.h b/examples/mainwindow/mainwindow.h index ed9643c..490cf91 100644 --- a/examples/mainwindow/mainwindow.h +++ b/examples/mainwindow/mainwindow.h @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/openglwidget/CMakeLists.txt b/examples/openglwidget/CMakeLists.txt index ea47cdb..ff3dedc 100644 --- a/examples/openglwidget/CMakeLists.txt +++ b/examples/openglwidget/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/openglwidget/images.qrc b/examples/openglwidget/images.qrc index 617c258..7a9f53b 100644 --- a/examples/openglwidget/images.qrc +++ b/examples/openglwidget/images.qrc @@ -1,3 +1,27 @@ + + images/qtlogo.png diff --git a/examples/openglwidget/mainwindow.cpp b/examples/openglwidget/mainwindow.cpp index eafdd1f..fdfca8f 100644 --- a/examples/openglwidget/mainwindow.cpp +++ b/examples/openglwidget/mainwindow.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/openglwidget/mainwindow.h b/examples/openglwidget/mainwindow.h index 0164435..ffe4e2c 100644 --- a/examples/openglwidget/mainwindow.h +++ b/examples/openglwidget/mainwindow.h @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/ApplicationWindow.qml b/examples/quick/ApplicationWindow.qml index 8f87805..d91b0f3 100644 --- a/examples/quick/ApplicationWindow.qml +++ b/examples/quick/ApplicationWindow.qml @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt index 2a6be78..846f3cb 100644 --- a/examples/quick/CMakeLists.txt +++ b/examples/quick/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/HomePage.qml b/examples/quick/HomePage.qml index 3e9bb97..4127b2e 100644 --- a/examples/quick/HomePage.qml +++ b/examples/quick/HomePage.qml @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/Window.qml b/examples/quick/Window.qml index d913a3c..af0b979 100644 --- a/examples/quick/Window.qml +++ b/examples/quick/Window.qml @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/main.cpp b/examples/quick/main.cpp index e940a41..bf668f5 100644 --- a/examples/quick/main.cpp +++ b/examples/quick/main.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/quicksettings.cpp b/examples/quick/quicksettings.cpp index eea551c..74b813a 100644 --- a/examples/quick/quicksettings.cpp +++ b/examples/quick/quicksettings.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/quicksettings.h b/examples/quick/quicksettings.h index 5706c3b..7fa8ab8 100644 --- a/examples/quick/quicksettings.h +++ b/examples/quick/quicksettings.h @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/resources.qrc b/examples/quick/resources.qrc index 152647e..cd408f3 100644 --- a/examples/quick/resources.qrc +++ b/examples/quick/resources.qrc @@ -1,3 +1,27 @@ + + images/microsoft.svg diff --git a/examples/quick/scripts/d3d11.bat b/examples/quick/scripts/d3d11.bat index 891763d..b9fe601 100644 --- a/examples/quick/scripts/d3d11.bat +++ b/examples/quick/scripts/d3d11.bat @@ -1,6 +1,6 @@ :: MIT License :: -:: Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) +:: Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) :: :: Permission is hereby granted, free of charge, to any person obtaining a copy :: of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/scripts/opengl.bat b/examples/quick/scripts/opengl.bat index 2b269ca..7946fa3 100644 --- a/examples/quick/scripts/opengl.bat +++ b/examples/quick/scripts/opengl.bat @@ -1,6 +1,6 @@ :: MIT License :: -:: Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) +:: Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) :: :: Permission is hereby granted, free of charge, to any person obtaining a copy :: of this software and associated documentation files (the "Software"), to deal diff --git a/examples/quick/scripts/vulkan.bat b/examples/quick/scripts/vulkan.bat index 949fdc3..cb8d0c9 100644 --- a/examples/quick/scripts/vulkan.bat +++ b/examples/quick/scripts/vulkan.bat @@ -1,6 +1,6 @@ :: MIT License :: -:: Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) +:: Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) :: :: Permission is hereby granted, free of charge, to any person obtaining a copy :: of this software and associated documentation files (the "Software"), to deal diff --git a/examples/shared/example.manifest b/examples/shared/example.manifest index 8a99ae9..7d3bc10 100644 --- a/examples/shared/example.manifest +++ b/examples/shared/example.manifest @@ -1,7 +1,7 @@ + resources/fonts/Micon.ttf diff --git a/src/core/framelesshelpercore_global.cpp b/src/core/framelesshelpercore_global.cpp index 4c269d6..a3bb49a 100644 --- a/src/core/framelesshelpercore_global.cpp +++ b/src/core/framelesshelpercore_global.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/framelessmanager.cpp b/src/core/framelessmanager.cpp index 64a55ef..05617f2 100644 --- a/src/core/framelessmanager.cpp +++ b/src/core/framelessmanager.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp index 9a0a174..ad647c1 100644 --- a/src/core/micamaterial.cpp +++ b/src/core/micamaterial.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/registrykey.cpp b/src/core/registrykey.cpp index 0db9be8..21cb472 100644 --- a/src/core/registrykey.cpp +++ b/src/core/registrykey.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/sysapiloader.cpp b/src/core/sysapiloader.cpp index 5991785..408acae 100644 --- a/src/core/sysapiloader.cpp +++ b/src/core/sysapiloader.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/utils.cpp b/src/core/utils.cpp index 7bc8674..df11f48 100644 --- a/src/core/utils.cpp +++ b/src/core/utils.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/utils_linux.cpp b/src/core/utils_linux.cpp index dd51387..5d6593c 100644 --- a/src/core/utils_linux.cpp +++ b/src/core/utils_linux.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/utils_mac.mm b/src/core/utils_mac.mm index b31a0f6..efafac8 100644 --- a/src/core/utils_mac.mm +++ b/src/core/utils_mac.mm @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/utils_win.cpp b/src/core/utils_win.cpp index 66efac1..2dadd09 100644 --- a/src/core/utils_win.cpp +++ b/src/core/utils_win.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/windowborderpainter.cpp b/src/core/windowborderpainter.cpp index 48e7f81..16e9a1d 100644 --- a/src/core/windowborderpainter.cpp +++ b/src/core/windowborderpainter.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/core/winverhelper.cpp b/src/core/winverhelper.cpp index 943d19c..a2fe31e 100644 --- a/src/core/winverhelper.cpp +++ b/src/core/winverhelper.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 9fba4c6..9199bd9 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelesshelperquick_global.cpp b/src/quick/framelesshelperquick_global.cpp index 4bac0db..3f745e6 100644 --- a/src/quick/framelesshelperquick_global.cpp +++ b/src/quick/framelesshelperquick_global.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelessquickapplicationwindow.cpp b/src/quick/framelessquickapplicationwindow.cpp index 1bf32d2..3f276a8 100644 --- a/src/quick/framelessquickapplicationwindow.cpp +++ b/src/quick/framelessquickapplicationwindow.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp index 7edda01..dfbf661 100644 --- a/src/quick/framelessquickhelper.cpp +++ b/src/quick/framelessquickhelper.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelessquickmodule.cpp b/src/quick/framelessquickmodule.cpp index 1c597cd..21a5f1e 100644 --- a/src/quick/framelessquickmodule.cpp +++ b/src/quick/framelessquickmodule.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelessquickutils.cpp b/src/quick/framelessquickutils.cpp index 82bec4f..0cc4c50 100644 --- a/src/quick/framelessquickutils.cpp +++ b/src/quick/framelessquickutils.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/framelessquickwindow.cpp b/src/quick/framelessquickwindow.cpp index f32ea33..f5e8966 100644 --- a/src/quick/framelessquickwindow.cpp +++ b/src/quick/framelessquickwindow.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickchromepalette.cpp b/src/quick/quickchromepalette.cpp index c6bf6a8..943c5dd 100644 --- a/src/quick/quickchromepalette.cpp +++ b/src/quick/quickchromepalette.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickimageitem.cpp b/src/quick/quickimageitem.cpp index 92dae41..c2e5c1a 100644 --- a/src/quick/quickimageitem.cpp +++ b/src/quick/quickimageitem.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickmicamaterial.cpp b/src/quick/quickmicamaterial.cpp index 509da24..0958568 100644 --- a/src/quick/quickmicamaterial.cpp +++ b/src/quick/quickmicamaterial.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickstandardsystembutton.cpp b/src/quick/quickstandardsystembutton.cpp index 20f39a4..d2d7432 100644 --- a/src/quick/quickstandardsystembutton.cpp +++ b/src/quick/quickstandardsystembutton.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickstandardtitlebar.cpp b/src/quick/quickstandardtitlebar.cpp index 13ae909..3d99eb7 100644 --- a/src/quick/quickstandardtitlebar.cpp +++ b/src/quick/quickstandardtitlebar.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/quick/quickwindowborder.cpp b/src/quick/quickwindowborder.cpp index 45d8441..d4c986b 100644 --- a/src/quick/quickwindowborder.cpp +++ b/src/quick/quickwindowborder.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 2e29f89..83b2b4e 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ MIT License - Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/framelessdialog.cpp b/src/widgets/framelessdialog.cpp index 36ff526..314bc7a 100644 --- a/src/widgets/framelessdialog.cpp +++ b/src/widgets/framelessdialog.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/framelesshelperwidgets_global.cpp b/src/widgets/framelesshelperwidgets_global.cpp index 78c182c..48f92e3 100644 --- a/src/widgets/framelesshelperwidgets_global.cpp +++ b/src/widgets/framelesshelperwidgets_global.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/framelessmainwindow.cpp b/src/widgets/framelessmainwindow.cpp index 3219e40..ab05601 100644 --- a/src/widgets/framelessmainwindow.cpp +++ b/src/widgets/framelessmainwindow.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/framelesswidget.cpp b/src/widgets/framelesswidget.cpp index 613a18c..5dea59c 100644 --- a/src/widgets/framelesswidget.cpp +++ b/src/widgets/framelesswidget.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp index e0066ec..9b46884 100644 --- a/src/widgets/framelesswidgetshelper.cpp +++ b/src/widgets/framelesswidgetshelper.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/standardsystembutton.cpp b/src/widgets/standardsystembutton.cpp index 71f03ca..7adda32 100644 --- a/src/widgets/standardsystembutton.cpp +++ b/src/widgets/standardsystembutton.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/standardtitlebar.cpp b/src/widgets/standardtitlebar.cpp index 48dff0c..7441fc3 100644 --- a/src/widgets/standardtitlebar.cpp +++ b/src/widgets/standardtitlebar.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/widgets/widgetssharedhelper.cpp b/src/widgets/widgetssharedhelper.cpp index 346de2f..e07a211 100644 --- a/src/widgets/widgetssharedhelper.cpp +++ b/src/widgets/widgetssharedhelper.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/tools/dpitester/CMakeLists.txt b/tools/dpitester/CMakeLists.txt index 9d2726a..1cea87d 100644 --- a/tools/dpitester/CMakeLists.txt +++ b/tools/dpitester/CMakeLists.txt @@ -1,4 +1,28 @@ -cmake_minimum_required(VERSION 3.24) +#[[ + MIT License + + Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +]] + +cmake_minimum_required(VERSION 3.25) project(DpiTester LANGUAGES RC CXX) @@ -14,13 +38,13 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -string(REGEX REPLACE "[-|/]GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -#string(REGEX REPLACE "[-|/]EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -string(REGEX REPLACE "[-|/]W[0|1|2|3|4]" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -string(REGEX REPLACE "[-|/]Ob[0|1|2|3]" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) -string(APPEND CMAKE_RC_FLAGS " /c65001 /DWIN32 /nologo ") +string(REGEX REPLACE "[-|/]GR-? " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +#string(REGEX REPLACE "[-|/]EHs-?c-? " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +string(REGEX REPLACE "[-|/]W[0|1|2|3|4] " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +string(REGEX REPLACE "[-|/]Ob[0|1|2|3] " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) +set(CMAKE_RC_FLAGS "/c65001 /DWIN32 /nologo") add_executable(${PROJECT_NAME}) @@ -48,5 +72,5 @@ target_compile_options(${PROJECT_NAME} PRIVATE target_link_options(${PROJECT_NAME} PRIVATE /DYNAMICBASE /HIGHENTROPYVA /LARGEADDRESSAWARE /NXCOMPAT /TSAWARE /WX - $<$>:/CETCOMPAT /GUARD:CF /GUARD:EHCONT /OPT:REF /OPT:ICF> + $<$>:/CETCOMPAT /GUARD:CF /guard:ehcont /OPT:REF /OPT:ICF> ) diff --git a/tools/dpitester/app.manifest b/tools/dpitester/app.manifest index 0356f4e..50fae46 100644 --- a/tools/dpitester/app.manifest +++ b/tools/dpitester/app.manifest @@ -1,7 +1,7 @@ + @@ -52,9 +54,11 @@ + + - + diff --git a/tools/dpitester/app.rc b/tools/dpitester/app.rc index b715feb..2f206f7 100644 --- a/tools/dpitester/app.rc +++ b/tools/dpitester/app.rc @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/tools/dpitester/main.cpp b/tools/dpitester/main.cpp index 49b5426..bd3d6be 100644 --- a/tools/dpitester/main.cpp +++ b/tools/dpitester/main.cpp @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (C) 2022 by wangwenx190 (Yuhang Zhao) + * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal