From 87870b037802c41dfd1239868ed12cfed4939927 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 7 Dec 2019 18:49:27 +0000 Subject: [PATCH] move QUnicodeTables to GUI component Signed-off-by: Ivailo Monev --- src/core/tools/tools.cmake | 2 -- src/{core/tools => gui/text}/qunicodetables.cpp | 0 src/{core/tools => gui/text}/qunicodetables_p.h | 0 src/gui/text/text.cmake | 2 ++ src/tools/moc/CMakeLists.txt | 1 - 5 files changed, 2 insertions(+), 3 deletions(-) rename src/{core/tools => gui/text}/qunicodetables.cpp (100%) rename src/{core/tools => gui/text}/qunicodetables_p.h (100%) diff --git a/src/core/tools/tools.cmake b/src/core/tools/tools.cmake index 4a434fb63..f3455ce9e 100644 --- a/src/core/tools/tools.cmake +++ b/src/core/tools/tools.cmake @@ -44,7 +44,6 @@ set(CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/tools/qtextboundaryfinder.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qtimeline.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qelapsedtimer.h - ${CMAKE_CURRENT_SOURCE_DIR}/tools/qunicodetables_p.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qvarlengtharray.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qvector.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcommandlineoption.h @@ -89,7 +88,6 @@ set(CORE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcommandlineparser.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qlocale_unix.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qelapsedtimer_unix.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tools/qunicodetables.cpp ) # Note: libm should be present by default becaue this is C++ diff --git a/src/core/tools/qunicodetables.cpp b/src/gui/text/qunicodetables.cpp similarity index 100% rename from src/core/tools/qunicodetables.cpp rename to src/gui/text/qunicodetables.cpp diff --git a/src/core/tools/qunicodetables_p.h b/src/gui/text/qunicodetables_p.h similarity index 100% rename from src/core/tools/qunicodetables_p.h rename to src/gui/text/qunicodetables_p.h diff --git a/src/gui/text/text.cmake b/src/gui/text/text.cmake index b501745a7..946edda32 100644 --- a/src/gui/text/text.cmake +++ b/src/gui/text/text.cmake @@ -43,6 +43,7 @@ set(GUI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/text/qharfbuzz_p.h ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11_p.h ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11.h + ${CMAKE_CURRENT_SOURCE_DIR}/text/qunicodetables_p.h ) set(GUI_SOURCES @@ -77,6 +78,7 @@ set(GUI_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.cpp ${CMAKE_CURRENT_SOURCE_DIR}/text/qfont_x11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/text/qunicodetables.cpp ) if(WITH_FONTCONFIG AND FONTCONFIG_FOUND) diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 2b489243f..85fad0cd6 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -81,7 +81,6 @@ set(BOOTSTRAP_SOURCES ${CMAKE_SOURCE_DIR}/src/core/tools/qvector.cpp ${CMAKE_SOURCE_DIR}/src/core/tools/qvsnprintf.cpp ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_unix.cpp - ${CMAKE_SOURCE_DIR}/src/core/tools/qunicodetables.cpp ) add_executable(bootstrap_moc ${BOOTSTRAP_SOURCES} ${MOC_SOURCES})