From 09acbfaf021f2ad304c8875c9a8420a7b63868b9 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Sun, 20 Mar 2022 12:30:00 +0800 Subject: [PATCH] adjust the project file architecture to make it more like a modern library project Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- CMakeLists.txt | 10 +--------- examples/mainwindow/CMakeLists.txt | 1 - examples/mainwindow/mainwindow.cpp | 5 ++++- examples/mainwindow/mainwindow.h | 2 +- examples/quick/CMakeLists.txt | 1 - examples/quick/main.cpp | 2 +- examples/widget/CMakeLists.txt | 1 - examples/widget/widget.cpp | 2 +- examples/widget/widget.h | 2 +- include/FramelessHelper/Core/FramelessHelper_Qt | 1 + include/FramelessHelper/Core/FramelessHelper_Win | 1 + include/FramelessHelper/Core/FramelessHelper_Windows | 1 + include/FramelessHelper/Core/FramelessWindowsManager | 1 + include/FramelessHelper/Core/Utils | 1 + .../FramelessHelper/Quick/FramelessHelperImageProvider | 1 + include/FramelessHelper/Quick/FramelessHelper_Quick | 1 + .../FramelessHelper/Quick/FramelessQuickEventFilter | 1 + include/FramelessHelper/Quick/FramelessQuickHelper | 1 + include/FramelessHelper/Quick/FramelessQuickUtils | 1 + include/FramelessHelper/Widgets/FramelessMainWindow | 1 + include/FramelessHelper/Widgets/FramelessWidget | 1 + include/FramelessHelper/Widgets/FramelessWidgetsHelper | 1 + src/CMakeLists.txt | 9 +++++++++ {core => src/core}/CMakeLists.txt | 2 ++ {core => src/core}/framelesshelper_qt.cpp | 0 {core => src/core}/framelesshelper_qt.h | 0 {core => src/core}/framelesshelper_win.cpp | 0 {core => src/core}/framelesshelper_win.h | 0 {core => src/core}/framelesshelper_windows.h | 0 {core => src/core}/framelesshelpercore.qrc | 0 {core => src/core}/framelesshelpercore.rc | 0 {core => src/core}/framelesshelpercore_global.h | 0 {core => src/core}/framelesswindowsmanager.cpp | 0 {core => src/core}/framelesswindowsmanager.h | 0 {core => src/core}/framelesswindowsmanager_p.h | 0 {core => src/core}/images/dark/chrome-close.svg | 0 {core => src/core}/images/dark/chrome-maximize.svg | 0 {core => src/core}/images/dark/chrome-minimize.svg | 0 {core => src/core}/images/dark/chrome-restore.svg | 0 {core => src/core}/images/light/chrome-close.svg | 0 {core => src/core}/images/light/chrome-maximize.svg | 0 {core => src/core}/images/light/chrome-minimize.svg | 0 {core => src/core}/images/light/chrome-restore.svg | 0 {core => src/core}/qwinregistry.cpp | 0 {core => src/core}/qwinregistry_p.h | 0 {core => src/core}/utils.cpp | 0 {core => src/core}/utils.h | 0 {core => src/core}/utils_linux.cpp | 0 {core => src/core}/utils_mac.cpp | 0 {core => src/core}/utils_win.cpp | 0 {quick => src/quick}/CMakeLists.txt | 5 +++++ {quick => src/quick}/framelesshelper_quick.cpp | 0 {quick => src/quick}/framelesshelper_quick.h | 0 {quick => src/quick}/framelesshelperimageprovider.cpp | 0 {quick => src/quick}/framelesshelperimageprovider.h | 0 {quick => src/quick}/framelesshelperquick.rc | 0 {quick => src/quick}/framelesshelperquick_global.h | 0 {quick => src/quick}/framelessquickeventfilter.cpp | 0 {quick => src/quick}/framelessquickeventfilter.h | 0 {quick => src/quick}/framelessquickhelper.cpp | 0 {quick => src/quick}/framelessquickhelper.h | 0 {quick => src/quick}/framelessquickutils.cpp | 0 {quick => src/quick}/framelessquickutils.h | 0 {widgets => src/widgets}/CMakeLists.txt | 5 +++++ {widgets => src/widgets}/framelesshelperwidgets.rc | 0 .../widgets}/framelesshelperwidgets_global.h | 0 {widgets => src/widgets}/framelessmainwindow.cpp | 0 {widgets => src/widgets}/framelessmainwindow.h | 0 {widgets => src/widgets}/framelesswidget.cpp | 0 {widgets => src/widgets}/framelesswidget.h | 0 {widgets => src/widgets}/framelesswidgetshelper.cpp | 0 {widgets => src/widgets}/framelesswidgetshelper.h | 0 72 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 include/FramelessHelper/Core/FramelessHelper_Qt create mode 100644 include/FramelessHelper/Core/FramelessHelper_Win create mode 100644 include/FramelessHelper/Core/FramelessHelper_Windows create mode 100644 include/FramelessHelper/Core/FramelessWindowsManager create mode 100644 include/FramelessHelper/Core/Utils create mode 100644 include/FramelessHelper/Quick/FramelessHelperImageProvider create mode 100644 include/FramelessHelper/Quick/FramelessHelper_Quick create mode 100644 include/FramelessHelper/Quick/FramelessQuickEventFilter create mode 100644 include/FramelessHelper/Quick/FramelessQuickHelper create mode 100644 include/FramelessHelper/Quick/FramelessQuickUtils create mode 100644 include/FramelessHelper/Widgets/FramelessMainWindow create mode 100644 include/FramelessHelper/Widgets/FramelessWidget create mode 100644 include/FramelessHelper/Widgets/FramelessWidgetsHelper create mode 100644 src/CMakeLists.txt rename {core => src/core}/CMakeLists.txt (93%) rename {core => src/core}/framelesshelper_qt.cpp (100%) rename {core => src/core}/framelesshelper_qt.h (100%) rename {core => src/core}/framelesshelper_win.cpp (100%) rename {core => src/core}/framelesshelper_win.h (100%) rename {core => src/core}/framelesshelper_windows.h (100%) rename {core => src/core}/framelesshelpercore.qrc (100%) rename {core => src/core}/framelesshelpercore.rc (100%) rename {core => src/core}/framelesshelpercore_global.h (100%) rename {core => src/core}/framelesswindowsmanager.cpp (100%) rename {core => src/core}/framelesswindowsmanager.h (100%) rename {core => src/core}/framelesswindowsmanager_p.h (100%) rename {core => src/core}/images/dark/chrome-close.svg (100%) rename {core => src/core}/images/dark/chrome-maximize.svg (100%) rename {core => src/core}/images/dark/chrome-minimize.svg (100%) rename {core => src/core}/images/dark/chrome-restore.svg (100%) rename {core => src/core}/images/light/chrome-close.svg (100%) rename {core => src/core}/images/light/chrome-maximize.svg (100%) rename {core => src/core}/images/light/chrome-minimize.svg (100%) rename {core => src/core}/images/light/chrome-restore.svg (100%) rename {core => src/core}/qwinregistry.cpp (100%) rename {core => src/core}/qwinregistry_p.h (100%) rename {core => src/core}/utils.cpp (100%) rename {core => src/core}/utils.h (100%) rename {core => src/core}/utils_linux.cpp (100%) rename {core => src/core}/utils_mac.cpp (100%) rename {core => src/core}/utils_win.cpp (100%) rename {quick => src/quick}/CMakeLists.txt (90%) rename {quick => src/quick}/framelesshelper_quick.cpp (100%) rename {quick => src/quick}/framelesshelper_quick.h (100%) rename {quick => src/quick}/framelesshelperimageprovider.cpp (100%) rename {quick => src/quick}/framelesshelperimageprovider.h (100%) rename {quick => src/quick}/framelesshelperquick.rc (100%) rename {quick => src/quick}/framelesshelperquick_global.h (100%) rename {quick => src/quick}/framelessquickeventfilter.cpp (100%) rename {quick => src/quick}/framelessquickeventfilter.h (100%) rename {quick => src/quick}/framelessquickhelper.cpp (100%) rename {quick => src/quick}/framelessquickhelper.h (100%) rename {quick => src/quick}/framelessquickutils.cpp (100%) rename {quick => src/quick}/framelessquickutils.h (100%) rename {widgets => src/widgets}/CMakeLists.txt (86%) rename {widgets => src/widgets}/framelesshelperwidgets.rc (100%) rename {widgets => src/widgets}/framelesshelperwidgets_global.h (100%) rename {widgets => src/widgets}/framelessmainwindow.cpp (100%) rename {widgets => src/widgets}/framelessmainwindow.h (100%) rename {widgets => src/widgets}/framelesswidget.cpp (100%) rename {widgets => src/widgets}/framelesswidget.h (100%) rename {widgets => src/widgets}/framelesswidgetshelper.cpp (100%) rename {widgets => src/widgets}/framelesswidgetshelper.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83f9aef..f15e40a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,15 +58,7 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets) find_package(QT NAMES Qt6 Qt5 COMPONENTS Quick) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick) -add_subdirectory(core) - -if(TARGET Qt${QT_VERSION_MAJOR}::Widgets) - add_subdirectory(widgets) -endif() - -if(TARGET Qt${QT_VERSION_MAJOR}::Quick) - add_subdirectory(quick) -endif() +add_subdirectory(src) if(FRAMELESSHELPER_BUILD_EXAMPLES) add_subdirectory(examples) diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt index 26de8b3..9ed048f 100644 --- a/examples/mainwindow/CMakeLists.txt +++ b/examples/mainwindow/CMakeLists.txt @@ -15,7 +15,6 @@ add_executable(MainWindow WIN32 ${SOURCES}) target_link_libraries(MainWindow PRIVATE Qt${QT_VERSION_MAJOR}::Widgets - FramelessHelperCore FramelessHelperWidgets ) diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp index 1ea893b..74d1d8d 100644 --- a/examples/mainwindow/mainwindow.cpp +++ b/examples/mainwindow/mainwindow.cpp @@ -25,7 +25,7 @@ #include "mainwindow.h" #include "ui_MainWindow.h" #include "ui_TitleBar.h" -#include +#include FRAMELESSHELPER_USE_NAMESPACE @@ -72,6 +72,9 @@ void MainWindow::setupUi() QMenuBar *mb = menuBar(); titleBar->horizontalLayout->insertWidget(1, mb); + // This call to the setMenuWidget() function is only needed by this example + // application to achieve some special effects, don't use it in your own + // code if you don't know what's it for! setMenuWidget(titleBarWidget); setTitleBarWidget(titleBarWidget); diff --git a/examples/mainwindow/mainwindow.h b/examples/mainwindow/mainwindow.h index 65909c4..878e9ba 100644 --- a/examples/mainwindow/mainwindow.h +++ b/examples/mainwindow/mainwindow.h @@ -24,7 +24,7 @@ #pragma once -#include +#include namespace Ui { diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt index a97afd7..b4c6b10 100644 --- a/examples/quick/CMakeLists.txt +++ b/examples/quick/CMakeLists.txt @@ -16,7 +16,6 @@ add_executable(Quick WIN32 ${SOURCES}) target_link_libraries(Quick PRIVATE Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::QuickControls2 - FramelessHelperCore FramelessHelperQuick ) diff --git a/examples/quick/main.cpp b/examples/quick/main.cpp index 7968699..9e31478 100644 --- a/examples/quick/main.cpp +++ b/examples/quick/main.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include FRAMELESSHELPER_USE_NAMESPACE diff --git a/examples/widget/CMakeLists.txt b/examples/widget/CMakeLists.txt index 4b9a15c..0bb0467 100644 --- a/examples/widget/CMakeLists.txt +++ b/examples/widget/CMakeLists.txt @@ -13,7 +13,6 @@ add_executable(Widget WIN32 ${SOURCES}) target_link_libraries(Widget PRIVATE Qt${QT_VERSION_MAJOR}::Widgets - FramelessHelperCore FramelessHelperWidgets ) diff --git a/examples/widget/widget.cpp b/examples/widget/widget.cpp index e99e59e..20224b9 100644 --- a/examples/widget/widget.cpp +++ b/examples/widget/widget.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include FRAMELESSHELPER_USE_NAMESPACE diff --git a/examples/widget/widget.h b/examples/widget/widget.h index af89853..54aaba3 100644 --- a/examples/widget/widget.h +++ b/examples/widget/widget.h @@ -24,7 +24,7 @@ #pragma once -#include +#include QT_BEGIN_NAMESPACE class QLabel; diff --git a/include/FramelessHelper/Core/FramelessHelper_Qt b/include/FramelessHelper/Core/FramelessHelper_Qt new file mode 100644 index 0000000..616e928 --- /dev/null +++ b/include/FramelessHelper/Core/FramelessHelper_Qt @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Core/FramelessHelper_Win b/include/FramelessHelper/Core/FramelessHelper_Win new file mode 100644 index 0000000..3b164aa --- /dev/null +++ b/include/FramelessHelper/Core/FramelessHelper_Win @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Core/FramelessHelper_Windows b/include/FramelessHelper/Core/FramelessHelper_Windows new file mode 100644 index 0000000..631fbdd --- /dev/null +++ b/include/FramelessHelper/Core/FramelessHelper_Windows @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Core/FramelessWindowsManager b/include/FramelessHelper/Core/FramelessWindowsManager new file mode 100644 index 0000000..a9d62b5 --- /dev/null +++ b/include/FramelessHelper/Core/FramelessWindowsManager @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Core/Utils b/include/FramelessHelper/Core/Utils new file mode 100644 index 0000000..4360d4c --- /dev/null +++ b/include/FramelessHelper/Core/Utils @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Quick/FramelessHelperImageProvider b/include/FramelessHelper/Quick/FramelessHelperImageProvider new file mode 100644 index 0000000..99e4503 --- /dev/null +++ b/include/FramelessHelper/Quick/FramelessHelperImageProvider @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Quick/FramelessHelper_Quick b/include/FramelessHelper/Quick/FramelessHelper_Quick new file mode 100644 index 0000000..f07ca8a --- /dev/null +++ b/include/FramelessHelper/Quick/FramelessHelper_Quick @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Quick/FramelessQuickEventFilter b/include/FramelessHelper/Quick/FramelessQuickEventFilter new file mode 100644 index 0000000..91fa73a --- /dev/null +++ b/include/FramelessHelper/Quick/FramelessQuickEventFilter @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Quick/FramelessQuickHelper b/include/FramelessHelper/Quick/FramelessQuickHelper new file mode 100644 index 0000000..1cbb62f --- /dev/null +++ b/include/FramelessHelper/Quick/FramelessQuickHelper @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Quick/FramelessQuickUtils b/include/FramelessHelper/Quick/FramelessQuickUtils new file mode 100644 index 0000000..4d9796e --- /dev/null +++ b/include/FramelessHelper/Quick/FramelessQuickUtils @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Widgets/FramelessMainWindow b/include/FramelessHelper/Widgets/FramelessMainWindow new file mode 100644 index 0000000..d915e06 --- /dev/null +++ b/include/FramelessHelper/Widgets/FramelessMainWindow @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Widgets/FramelessWidget b/include/FramelessHelper/Widgets/FramelessWidget new file mode 100644 index 0000000..81513ae --- /dev/null +++ b/include/FramelessHelper/Widgets/FramelessWidget @@ -0,0 +1 @@ +#include diff --git a/include/FramelessHelper/Widgets/FramelessWidgetsHelper b/include/FramelessHelper/Widgets/FramelessWidgetsHelper new file mode 100644 index 0000000..51467e8 --- /dev/null +++ b/include/FramelessHelper/Widgets/FramelessWidgetsHelper @@ -0,0 +1 @@ +#include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..8a8665e --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(core) + +if(TARGET Qt${QT_VERSION_MAJOR}::Widgets) + add_subdirectory(widgets) +endif() + +if(TARGET Qt${QT_VERSION_MAJOR}::Quick) + add_subdirectory(quick) +endif() diff --git a/core/CMakeLists.txt b/src/core/CMakeLists.txt similarity index 93% rename from core/CMakeLists.txt rename to src/core/CMakeLists.txt index 7d1ce16..2522830 100644 --- a/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -80,4 +80,6 @@ target_link_libraries(${SUB_PROJ_NAME} PRIVATE target_include_directories(${SUB_PROJ_NAME} PUBLIC "$" + "$/../../include/FramelessHelper/Core" + "$/../../include" ) diff --git a/core/framelesshelper_qt.cpp b/src/core/framelesshelper_qt.cpp similarity index 100% rename from core/framelesshelper_qt.cpp rename to src/core/framelesshelper_qt.cpp diff --git a/core/framelesshelper_qt.h b/src/core/framelesshelper_qt.h similarity index 100% rename from core/framelesshelper_qt.h rename to src/core/framelesshelper_qt.h diff --git a/core/framelesshelper_win.cpp b/src/core/framelesshelper_win.cpp similarity index 100% rename from core/framelesshelper_win.cpp rename to src/core/framelesshelper_win.cpp diff --git a/core/framelesshelper_win.h b/src/core/framelesshelper_win.h similarity index 100% rename from core/framelesshelper_win.h rename to src/core/framelesshelper_win.h diff --git a/core/framelesshelper_windows.h b/src/core/framelesshelper_windows.h similarity index 100% rename from core/framelesshelper_windows.h rename to src/core/framelesshelper_windows.h diff --git a/core/framelesshelpercore.qrc b/src/core/framelesshelpercore.qrc similarity index 100% rename from core/framelesshelpercore.qrc rename to src/core/framelesshelpercore.qrc diff --git a/core/framelesshelpercore.rc b/src/core/framelesshelpercore.rc similarity index 100% rename from core/framelesshelpercore.rc rename to src/core/framelesshelpercore.rc diff --git a/core/framelesshelpercore_global.h b/src/core/framelesshelpercore_global.h similarity index 100% rename from core/framelesshelpercore_global.h rename to src/core/framelesshelpercore_global.h diff --git a/core/framelesswindowsmanager.cpp b/src/core/framelesswindowsmanager.cpp similarity index 100% rename from core/framelesswindowsmanager.cpp rename to src/core/framelesswindowsmanager.cpp diff --git a/core/framelesswindowsmanager.h b/src/core/framelesswindowsmanager.h similarity index 100% rename from core/framelesswindowsmanager.h rename to src/core/framelesswindowsmanager.h diff --git a/core/framelesswindowsmanager_p.h b/src/core/framelesswindowsmanager_p.h similarity index 100% rename from core/framelesswindowsmanager_p.h rename to src/core/framelesswindowsmanager_p.h diff --git a/core/images/dark/chrome-close.svg b/src/core/images/dark/chrome-close.svg similarity index 100% rename from core/images/dark/chrome-close.svg rename to src/core/images/dark/chrome-close.svg diff --git a/core/images/dark/chrome-maximize.svg b/src/core/images/dark/chrome-maximize.svg similarity index 100% rename from core/images/dark/chrome-maximize.svg rename to src/core/images/dark/chrome-maximize.svg diff --git a/core/images/dark/chrome-minimize.svg b/src/core/images/dark/chrome-minimize.svg similarity index 100% rename from core/images/dark/chrome-minimize.svg rename to src/core/images/dark/chrome-minimize.svg diff --git a/core/images/dark/chrome-restore.svg b/src/core/images/dark/chrome-restore.svg similarity index 100% rename from core/images/dark/chrome-restore.svg rename to src/core/images/dark/chrome-restore.svg diff --git a/core/images/light/chrome-close.svg b/src/core/images/light/chrome-close.svg similarity index 100% rename from core/images/light/chrome-close.svg rename to src/core/images/light/chrome-close.svg diff --git a/core/images/light/chrome-maximize.svg b/src/core/images/light/chrome-maximize.svg similarity index 100% rename from core/images/light/chrome-maximize.svg rename to src/core/images/light/chrome-maximize.svg diff --git a/core/images/light/chrome-minimize.svg b/src/core/images/light/chrome-minimize.svg similarity index 100% rename from core/images/light/chrome-minimize.svg rename to src/core/images/light/chrome-minimize.svg diff --git a/core/images/light/chrome-restore.svg b/src/core/images/light/chrome-restore.svg similarity index 100% rename from core/images/light/chrome-restore.svg rename to src/core/images/light/chrome-restore.svg diff --git a/core/qwinregistry.cpp b/src/core/qwinregistry.cpp similarity index 100% rename from core/qwinregistry.cpp rename to src/core/qwinregistry.cpp diff --git a/core/qwinregistry_p.h b/src/core/qwinregistry_p.h similarity index 100% rename from core/qwinregistry_p.h rename to src/core/qwinregistry_p.h diff --git a/core/utils.cpp b/src/core/utils.cpp similarity index 100% rename from core/utils.cpp rename to src/core/utils.cpp diff --git a/core/utils.h b/src/core/utils.h similarity index 100% rename from core/utils.h rename to src/core/utils.h diff --git a/core/utils_linux.cpp b/src/core/utils_linux.cpp similarity index 100% rename from core/utils_linux.cpp rename to src/core/utils_linux.cpp diff --git a/core/utils_mac.cpp b/src/core/utils_mac.cpp similarity index 100% rename from core/utils_mac.cpp rename to src/core/utils_mac.cpp diff --git a/core/utils_win.cpp b/src/core/utils_win.cpp similarity index 100% rename from core/utils_win.cpp rename to src/core/utils_win.cpp diff --git a/quick/CMakeLists.txt b/src/quick/CMakeLists.txt similarity index 90% rename from quick/CMakeLists.txt rename to src/quick/CMakeLists.txt index 3d0d0f4..31239ad 100644 --- a/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -62,9 +62,14 @@ endif() target_link_libraries(${SUB_PROJ_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::QuickPrivate +) + +target_link_libraries(${SUB_PROJ_NAME} PUBLIC FramelessHelperCore ) target_include_directories(${SUB_PROJ_NAME} PUBLIC "$" + "$/../../include/FramelessHelper/Quick" + "$/../../include" ) diff --git a/quick/framelesshelper_quick.cpp b/src/quick/framelesshelper_quick.cpp similarity index 100% rename from quick/framelesshelper_quick.cpp rename to src/quick/framelesshelper_quick.cpp diff --git a/quick/framelesshelper_quick.h b/src/quick/framelesshelper_quick.h similarity index 100% rename from quick/framelesshelper_quick.h rename to src/quick/framelesshelper_quick.h diff --git a/quick/framelesshelperimageprovider.cpp b/src/quick/framelesshelperimageprovider.cpp similarity index 100% rename from quick/framelesshelperimageprovider.cpp rename to src/quick/framelesshelperimageprovider.cpp diff --git a/quick/framelesshelperimageprovider.h b/src/quick/framelesshelperimageprovider.h similarity index 100% rename from quick/framelesshelperimageprovider.h rename to src/quick/framelesshelperimageprovider.h diff --git a/quick/framelesshelperquick.rc b/src/quick/framelesshelperquick.rc similarity index 100% rename from quick/framelesshelperquick.rc rename to src/quick/framelesshelperquick.rc diff --git a/quick/framelesshelperquick_global.h b/src/quick/framelesshelperquick_global.h similarity index 100% rename from quick/framelesshelperquick_global.h rename to src/quick/framelesshelperquick_global.h diff --git a/quick/framelessquickeventfilter.cpp b/src/quick/framelessquickeventfilter.cpp similarity index 100% rename from quick/framelessquickeventfilter.cpp rename to src/quick/framelessquickeventfilter.cpp diff --git a/quick/framelessquickeventfilter.h b/src/quick/framelessquickeventfilter.h similarity index 100% rename from quick/framelessquickeventfilter.h rename to src/quick/framelessquickeventfilter.h diff --git a/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp similarity index 100% rename from quick/framelessquickhelper.cpp rename to src/quick/framelessquickhelper.cpp diff --git a/quick/framelessquickhelper.h b/src/quick/framelessquickhelper.h similarity index 100% rename from quick/framelessquickhelper.h rename to src/quick/framelessquickhelper.h diff --git a/quick/framelessquickutils.cpp b/src/quick/framelessquickutils.cpp similarity index 100% rename from quick/framelessquickutils.cpp rename to src/quick/framelessquickutils.cpp diff --git a/quick/framelessquickutils.h b/src/quick/framelessquickutils.h similarity index 100% rename from quick/framelessquickutils.h rename to src/quick/framelessquickutils.h diff --git a/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt similarity index 86% rename from widgets/CMakeLists.txt rename to src/widgets/CMakeLists.txt index 9d5fd72..c13740d 100644 --- a/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -49,9 +49,14 @@ endif() target_link_libraries(${SUB_PROJ_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets +) + +target_link_libraries(${SUB_PROJ_NAME} PUBLIC FramelessHelperCore ) target_include_directories(${SUB_PROJ_NAME} PUBLIC "$" + "$/../../include/FramelessHelper/Widgets" + "$/../../include" ) diff --git a/widgets/framelesshelperwidgets.rc b/src/widgets/framelesshelperwidgets.rc similarity index 100% rename from widgets/framelesshelperwidgets.rc rename to src/widgets/framelesshelperwidgets.rc diff --git a/widgets/framelesshelperwidgets_global.h b/src/widgets/framelesshelperwidgets_global.h similarity index 100% rename from widgets/framelesshelperwidgets_global.h rename to src/widgets/framelesshelperwidgets_global.h diff --git a/widgets/framelessmainwindow.cpp b/src/widgets/framelessmainwindow.cpp similarity index 100% rename from widgets/framelessmainwindow.cpp rename to src/widgets/framelessmainwindow.cpp diff --git a/widgets/framelessmainwindow.h b/src/widgets/framelessmainwindow.h similarity index 100% rename from widgets/framelessmainwindow.h rename to src/widgets/framelessmainwindow.h diff --git a/widgets/framelesswidget.cpp b/src/widgets/framelesswidget.cpp similarity index 100% rename from widgets/framelesswidget.cpp rename to src/widgets/framelesswidget.cpp diff --git a/widgets/framelesswidget.h b/src/widgets/framelesswidget.h similarity index 100% rename from widgets/framelesswidget.h rename to src/widgets/framelesswidget.h diff --git a/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp similarity index 100% rename from widgets/framelesswidgetshelper.cpp rename to src/widgets/framelesswidgetshelper.cpp diff --git a/widgets/framelesswidgetshelper.h b/src/widgets/framelesswidgetshelper.h similarity index 100% rename from widgets/framelesswidgetshelper.h rename to src/widgets/framelesswidgetshelper.h