Sine Striker
2023-12-12 83710cb96187d635be1be95ac1a2652c28d695cd
Add example icon
7个文件已修改
1个文件已添加
44 ■■■■ 已修改文件
examples/CMakeLists.txt 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
examples/mainwindow/CMakeLists.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
examples/qml/CMakeLists.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
examples/shared/resources/example.ico 补丁 | 查看 | 原始文档 | blame | 历史
qmsetup @ 622dd3 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/CMakeLists.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/core/kernel/nativeeventfilter.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/core/windowitemdelegate_p.h 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
examples/CMakeLists.txt
@@ -1,4 +1,18 @@
set(QWK_EXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR})
macro(qwk_add_example _target)
    set(CMAKE_AUTOMOC ON)
    set(CMAKE_AUTOUIC ON)
    set(CMAKE_AUTORCC ON)
    add_executable(${_target})
    qm_configure_target(${_target} ${ARGN})
    qm_add_win_rc(${_target} ICON ../shared/resources/example.ico)
    qm_add_win_manifest(${_target})
endmacro()
add_subdirectory(shared)
add_subdirectory(mainwindow)
add_subdirectory(qml)
examples/mainwindow/CMakeLists.txt
@@ -1,17 +1,9 @@
project(QWKExample_MainWindow)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
file(GLOB _src *.h *.cpp)
add_executable(${PROJECT_NAME})
qm_configure_target(${PROJECT_NAME}
qwk_add_example(${PROJECT_NAME}
    SOURCES ${_src}
    QT_LINKS Core Gui Widgets
    LINKS QWKWidgets WidgetFrame
)
qm_add_win_manifest(${PROJECT_NAME})
examples/qml/CMakeLists.txt
@@ -1,17 +1,9 @@
project(QWKExample_QML)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
file(GLOB _src *.h *.cpp *.qrc)
add_executable(${PROJECT_NAME})
qm_configure_target(${PROJECT_NAME}
qwk_add_example(${PROJECT_NAME}
    SOURCES ${_src}
    QT_LINKS Core Gui Qml Quick
    LINKS QWKQuick
)
qm_add_win_manifest(${PROJECT_NAME})
examples/shared/resources/example.ico
qmsetup
@@ -1 +1 @@
Subproject commit c8d69a4895784220061c3cf8be5f092da2ac013e
Subproject commit 622dd3b8688eaa140c1631ac94862f5ef723c73a
src/CMakeLists.txt
@@ -27,7 +27,7 @@
# ----------------------------------
# CMake API
# ----------------------------------
function(qwk_add_library _target)
macro(qwk_add_library _target)
    set(options AUTOGEN NO_SYNC_INCLUDE NO_WIN_RC)
    set(oneValueArgs SYNC_INCLUDE_PREFIX PREFIX)
    set(multiValueArgs SYNC_INCLUDE_OPTIONS)
@@ -115,7 +115,7 @@
            "$<BUILD_INTERFACE:${QWINDOWKIT_GENERATED_INCLUDE_DIR}>"
        )
    endif()
endfunction()
endmacro()
# ----------------------------------
# Main Project
src/core/kernel/nativeeventfilter.cpp
@@ -14,7 +14,7 @@
        }
        ~MasterNativeEventFilter() override {
            qApp->removeNativeEventFilter(this);
            // The base class removes automatically
        }
        bool nativeEventFilter(const QByteArray &eventType, void *message,
src/core/windowitemdelegate_p.h
@@ -30,7 +30,7 @@
        virtual void resetQtGrabbedControl() const;
    private:
        Q_DISABLE_COPY_MOVE(WindowItemDelegate)
        Q_DISABLE_COPY(WindowItemDelegate)
    };
}