From beebd7f4b197b6ba918439d6a8af809744ae81d7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 17 Mar 2020 09:05:10 +0100 Subject: CMake: Regenerate projects and adjust after old harfbuzz removal Change-Id: I3a00334f2b29caa739d6a1d8edd4c7311dda812f Reviewed-by: Lars Knoll --- src/corelib/.prev_CMakeLists.txt | 11 ------- src/platformsupport/.prev_CMakeLists.txt | 45 ++++++++++++++++++++++++++ src/platformsupport/CMakeLists.txt | 2 +- src/plugins/platforms/ios/.prev_CMakeLists.txt | 1 + 4 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 src/platformsupport/.prev_CMakeLists.txt (limited to 'src') diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index db9ba4f531..28882a93aa 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -9,15 +9,6 @@ qt_add_module(Core QMAKE_MODULE_CONFIG moc resources EXCEPTIONS SOURCES - ../3rdparty/harfbuzz/src/harfbuzz.h - ../3rdparty/harfbuzz/src/harfbuzz-buffer.c - ../3rdparty/harfbuzz/src/harfbuzz-gdef.c - ../3rdparty/harfbuzz/src/harfbuzz-gpos.c - ../3rdparty/harfbuzz/src/harfbuzz-gsub.c - ../3rdparty/harfbuzz/src/harfbuzz-impl.c - ../3rdparty/harfbuzz/src/harfbuzz-open.c - ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp - ../3rdparty/harfbuzz/src/harfbuzz-stream.c codecs/qtextcodec_p.h codecs/qutfcodec.cpp codecs/qutfcodec_p.h global/archdetect.cpp @@ -152,7 +143,6 @@ qt_add_module(Core text/qchar.h text/qcollator.cpp text/qcollator.h text/qcollator_p.h text/qdoublescanprint_p.h - text/qharfbuzz.cpp text/qharfbuzz_p.h text/qlocale.cpp text/qlocale.h text/qlocale_p.h text/qlocale_data_p.h text/qlocale_tools.cpp text/qlocale_tools_p.h @@ -233,7 +223,6 @@ qt_add_module(Core QT_NO_USING_NAMESPACE INCLUDE_DIRECTORIES ${PROJECT_BINARY_DIR}/src/corelib/global - ../3rdparty/harfbuzz/src ../3rdparty/md4 ../3rdparty/md5 ../3rdparty/sha3 diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9d237c65ed --- /dev/null +++ b/src/platformsupport/.prev_CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from platformsupport.pro. + +add_subdirectory(edid) +add_subdirectory(eventdispatchers) +add_subdirectory(devicediscovery) +add_subdirectory(fbconvenience) +add_subdirectory(themes) +add_subdirectory(linuxofono) +if(APPLE OR QT_FEATURE_freetype OR WIN32) + add_subdirectory(fontdatabases) +endif() +if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) + add_subdirectory(input) +endif() +if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT)) + add_subdirectory(services) +endif() +if(QT_FEATURE_opengl) + add_subdirectory(platformcompositor) +endif() +if(QT_FEATURE_egl) + add_subdirectory(eglconvenience) +endif() +if(QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2) + add_subdirectory(glxconvenience) +endif() +if(QT_FEATURE_kms) + add_subdirectory(kmsconvenience) +endif() +if(QT_FEATURE_accessibility) + add_subdirectory(accessibility) +endif() +if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) + add_subdirectory(linuxaccessibility) +endif() +if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT) + add_subdirectory(windowsuiautomation) +endif() +if(APPLE) + add_subdirectory(clipboard) + add_subdirectory(graphics) +endif() +if(QT_FEATURE_vulkan) + add_subdirectory(vkconvenience) +endif() diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index 9e91754ac8..b0110b0db1 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -13,7 +13,7 @@ endif() if(APPLE OR QT_FEATURE_freetype OR WIN32) add_subdirectory(fontdatabases) endif() -if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib) +if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) add_subdirectory(input) endif() if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT)) diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt index 3a330e2b7b..8916e1772b 100644 --- a/src/plugins/platforms/ios/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt @@ -52,6 +52,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm + qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm qiosfiledialog.h qiosfiledialog.mm qiosmenu.h qiosmenu.mm qiosmessagedialog.h qiosmessagedialog.mm -- cgit v1.2.3