diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f43492b7..2adf192d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -423,17 +423,20 @@ list(APPEND SOURCES ) list(APPEND HEADERS - controls/LevelingSensor/QskSGNodeUtility.h - controls/LevelingSensor/QskLevelingSensor.h - controls/LevelingSensor/QskLevelingSensorNodes.h - controls/LevelingSensor/QskLevelingSensorSkinlet.h - controls/LevelingSensor/QskLevelingSensorUtility.h + controls/QskLevelingSensor.h + controls/QskLevelingSensorSkinlet.h +) + +list(APPEND PRIVATE_HEADERS + controls/private/QskSGNodeUtility.h + controls/private/QskLevelingSensorNodes.h + controls/private/QskLevelingSensorUtility.h ) list(APPEND SOURCES - controls/LevelingSensor/QskSGNodeUtility.cpp - controls/LevelingSensor/QskLevelingSensor.cpp - controls/LevelingSensor/QskLevelingSensorSkinlet.cpp + controls/private/QskSGNodeUtility.cpp + controls/private/QskLevelingSensor.cpp + controls/private/QskLevelingSensorSkinlet.cpp ) if(ENABLE_PINYIN) @@ -468,6 +471,9 @@ target_include_directories(${target} PUBLIC $ $) +target_include_directories(${target} PRIVATE + $) + target_link_libraries(${target} PUBLIC Qt::Core Qt::CorePrivate Qt::Quick Qt::QuickPrivate) @@ -495,6 +501,10 @@ set_target_properties(${target} list(TRANSFORM HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/") set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}") + +list(TRANSFORM PRIVATE_HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/") +set_target_properties(${target} PROPERTIES PRIVATE_HEADER "${PRIVATE_HEADERS}") + set_target_properties(${target} PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) diff --git a/src/controls/LevelingSensor/QskLevelingSensor.h b/src/controls/QskLevelingSensor.h similarity index 100% rename from src/controls/LevelingSensor/QskLevelingSensor.h rename to src/controls/QskLevelingSensor.h diff --git a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.h b/src/controls/QskLevelingSensorSkinlet.h similarity index 100% rename from src/controls/LevelingSensor/QskLevelingSensorSkinlet.h rename to src/controls/QskLevelingSensorSkinlet.h diff --git a/src/controls/LevelingSensor/QskLevelingSensor.cpp b/src/controls/private/QskLevelingSensor.cpp similarity index 98% rename from src/controls/LevelingSensor/QskLevelingSensor.cpp rename to src/controls/private/QskLevelingSensor.cpp index 8c73f0b0..fd4f7bd9 100644 --- a/src/controls/LevelingSensor/QskLevelingSensor.cpp +++ b/src/controls/private/QskLevelingSensor.cpp @@ -1,4 +1,4 @@ -#include "QskLevelingSensor.h" +#include #include #include #include diff --git a/src/controls/LevelingSensor/QskLevelingSensorNodes.h b/src/controls/private/QskLevelingSensorNodes.h similarity index 100% rename from src/controls/LevelingSensor/QskLevelingSensorNodes.h rename to src/controls/private/QskLevelingSensorNodes.h diff --git a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp b/src/controls/private/QskLevelingSensorSkinlet.cpp similarity index 99% rename from src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp rename to src/controls/private/QskLevelingSensorSkinlet.cpp index 51102fb5..c56cdd8e 100644 --- a/src/controls/LevelingSensor/QskLevelingSensorSkinlet.cpp +++ b/src/controls/private/QskLevelingSensorSkinlet.cpp @@ -1,5 +1,5 @@ -#include "QskLevelingSensorSkinlet.h" -#include "QskLevelingSensor.h" +#include +#include #include "QskLevelingSensorUtility.h" #include "QskLevelingSensorNodes.h" #include "QskSGNodeUtility.h" diff --git a/src/controls/LevelingSensor/QskLevelingSensorUtility.h b/src/controls/private/QskLevelingSensorUtility.h similarity index 100% rename from src/controls/LevelingSensor/QskLevelingSensorUtility.h rename to src/controls/private/QskLevelingSensorUtility.h diff --git a/src/controls/LevelingSensor/QskSGNodeUtility.cpp b/src/controls/private/QskSGNodeUtility.cpp similarity index 100% rename from src/controls/LevelingSensor/QskSGNodeUtility.cpp rename to src/controls/private/QskSGNodeUtility.cpp diff --git a/src/controls/LevelingSensor/QskSGNodeUtility.h b/src/controls/private/QskSGNodeUtility.h similarity index 100% rename from src/controls/LevelingSensor/QskSGNodeUtility.h rename to src/controls/private/QskSGNodeUtility.h