CMake: Re-generate project files in src
Change-Id: I1f5f822d68129490f1a7c495f718aead0b520ca9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d4e9f0e6332d1ea740e28718d21281099c6d62e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
211ad0f768
commit
47f23efaf4
@ -65,6 +65,7 @@ qt_disable_warnings(BundledHarfbuzz)
|
|||||||
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
|
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
|
||||||
|
|
||||||
#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
|
#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
|
||||||
|
# MODULE_EXT_HEADERS = "src/hb-atomic.hh" "src/hb-algs.hh" "src/hb-buffer.hh" "src/hb-buffer-deserialize-json.hh" "src/hb-buffer-deserialize-text.hh" "src/hb-cache.hh" "src/hb-debug.hh" "src/hb-face.hh" "src/hb-font.hh" "src/hb-mutex.hh" "src/hb-object.hh" "src/hb-open-file.hh" "src/hb-open-type.hh" "src/hb-set-digest.hh" "src/hb-set.hh" "src/hb-shape-plan.hh" "src/hb-shaper-impl.hh" "src/hb-shaper-list.hh" "src/hb-shaper.hh" "src/hb-string-array.hh" "src/hb-unicode.hh" "src/hb-utf.hh" "src/hb.h" "src/hb-blob.h" "src/hb-buffer.h" "src/hb-common.h" "src/hb-deprecated.h" "src/hb-face.h" "src/hb-font.h" "src/hb-set.h" "src/hb-shape.h" "src/hb-shape-plan.h" "src/hb-unicode.h" "src/hb-version.h"
|
||||||
# OTHER_FILES = "$$PWD/src/harfbuzz.cc"
|
# OTHER_FILES = "$$PWD/src/harfbuzz.cc"
|
||||||
# SHAPERS = "opentype"
|
# SHAPERS = "opentype"
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@ qt_internal_add_module(Core
|
|||||||
global/qglobal.cpp global/qglobal.h
|
global/qglobal.cpp global/qglobal.h
|
||||||
global/qglobalstatic.h
|
global/qglobalstatic.h
|
||||||
global/qhooks.cpp global/qhooks_p.h
|
global/qhooks.cpp global/qhooks_p.h
|
||||||
global/qisenum.h
|
|
||||||
global/qlibraryinfo.cpp global/qlibraryinfo.h
|
global/qlibraryinfo.cpp global/qlibraryinfo.h
|
||||||
global/qlogging.cpp global/qlogging.h
|
global/qlogging.cpp global/qlogging.h
|
||||||
global/qmalloc.cpp
|
global/qmalloc.cpp
|
||||||
global/qmemory_p.h
|
|
||||||
global/qnamespace.h
|
global/qnamespace.h
|
||||||
global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h
|
global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h
|
||||||
global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
|
global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
|
||||||
@ -204,7 +202,7 @@ qt_internal_add_module(Core
|
|||||||
tools/qrect.cpp tools/qrect.h
|
tools/qrect.cpp tools/qrect.h
|
||||||
tools/qrefcount.cpp tools/qrefcount.h
|
tools/qrefcount.cpp tools/qrefcount.h
|
||||||
tools/qringbuffer.cpp tools/qringbuffer_p.h
|
tools/qringbuffer.cpp tools/qringbuffer_p.h
|
||||||
tools/qscopedpointer.h tools/qscopedpointer_p.h
|
tools/qscopedpointer.h
|
||||||
tools/qscopedvaluerollback.h
|
tools/qscopedvaluerollback.h
|
||||||
tools/qscopeguard.h
|
tools/qscopeguard.h
|
||||||
tools/qset.h
|
tools/qset.h
|
||||||
|
@ -35,8 +35,8 @@ qt_internal_add_module(Gui
|
|||||||
image/qxpmhandler.cpp image/qxpmhandler_p.h
|
image/qxpmhandler.cpp image/qxpmhandler_p.h
|
||||||
kernel/qclipboard.cpp kernel/qclipboard.h
|
kernel/qclipboard.cpp kernel/qclipboard.h
|
||||||
kernel/qcursor.cpp kernel/qcursor.h kernel/qcursor_p.h
|
kernel/qcursor.cpp kernel/qcursor.h kernel/qcursor_p.h
|
||||||
kernel/qeventpoint.cpp kernel/qeventpoint.h kernel/qeventpoint_p.h
|
|
||||||
kernel/qevent.cpp kernel/qevent.h kernel/qevent_p.h
|
kernel/qevent.cpp kernel/qevent.h kernel/qevent_p.h
|
||||||
|
kernel/qeventpoint.cpp kernel/qeventpoint.h kernel/qeventpoint_p.h
|
||||||
kernel/qgenericplugin.cpp kernel/qgenericplugin.h
|
kernel/qgenericplugin.cpp kernel/qgenericplugin.h
|
||||||
kernel/qgenericpluginfactory.cpp kernel/qgenericpluginfactory.h
|
kernel/qgenericpluginfactory.cpp kernel/qgenericpluginfactory.h
|
||||||
kernel/qguiapplication.cpp kernel/qguiapplication.h kernel/qguiapplication_p.h
|
kernel/qguiapplication.cpp kernel/qguiapplication.h kernel/qguiapplication_p.h
|
||||||
|
@ -401,11 +401,15 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q
|
|||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
WrapOpenSSL::WrapOpenSSL
|
WrapOpenSSL::WrapOpenSSL
|
||||||
|
PRIVATE_MODULE_INTERFACE
|
||||||
|
WrapOpenSSL::WrapOpenSSL
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
||||||
|
PRIVATE_MODULE_INTERFACE
|
||||||
|
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
|
||||||
|
@ -401,11 +401,15 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q
|
|||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
WrapOpenSSL::WrapOpenSSL
|
WrapOpenSSL::WrapOpenSSL
|
||||||
|
PRIVATE_MODULE_INTERFACE
|
||||||
|
WrapOpenSSL::WrapOpenSSL
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
||||||
|
PRIVATE_MODULE_INTERFACE
|
||||||
|
WrapOpenSSLHeaders::WrapOpenSSLHeaders
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
|
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
|
||||||
|
@ -86,8 +86,6 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
|
|||||||
qeglfsmain.cpp
|
qeglfsmain.cpp
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_EGL_NO_X11
|
QT_EGL_NO_X11
|
||||||
INCLUDE_DIRECTORIES
|
|
||||||
api
|
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::EglFSDeviceIntegrationPrivate
|
Qt::EglFSDeviceIntegrationPrivate
|
||||||
)
|
)
|
||||||
|
@ -14,9 +14,6 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
|
|||||||
qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h
|
qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_EGL_NO_X11
|
QT_EGL_NO_X11
|
||||||
INCLUDE_DIRECTORIES
|
|
||||||
../../api
|
|
||||||
../eglfs_kms_support
|
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Libdrm::Libdrm
|
Libdrm::Libdrm
|
||||||
Qt::Core
|
Qt::Core
|
||||||
|
@ -15,8 +15,6 @@ qt_internal_add_module(EglFsKmsSupport
|
|||||||
qeglfskmsscreen.cpp qeglfskmsscreen_p.h
|
qeglfskmsscreen.cpp qeglfskmsscreen_p.h
|
||||||
DEFINES
|
DEFINES
|
||||||
QT_EGL_NO_X11
|
QT_EGL_NO_X11
|
||||||
INCLUDE_DIRECTORIES
|
|
||||||
../../api
|
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Libdrm::Libdrm
|
Libdrm::Libdrm
|
||||||
Qt::Core
|
Qt::Core
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
|
qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
|
||||||
OUTPUT_NAME qiosnsphotolibrarysupport
|
OUTPUT_NAME qiosnsphotolibrarysupport
|
||||||
TYPE platforms/darwin
|
TYPE platforms/darwin
|
||||||
|
DEFAULT_IF FALSE
|
||||||
SOURCES
|
SOURCES
|
||||||
plugin.mm
|
plugin.mm
|
||||||
qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
|
qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
|
qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
|
||||||
OUTPUT_NAME qiosnsphotolibrarysupport
|
OUTPUT_NAME qiosnsphotolibrarysupport
|
||||||
TYPE platforms/darwin
|
TYPE platforms/darwin
|
||||||
|
DEFAULT_IF FALSE
|
||||||
SOURCES
|
SOURCES
|
||||||
plugin.mm
|
plugin.mm
|
||||||
qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
|
qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
|
||||||
|
23
src/plugins/styles/mac/.prev_CMakeLists.txt
Normal file
23
src/plugins/styles/mac/.prev_CMakeLists.txt
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# Generated from mac.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## QMacStylePlugin Plugin:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_internal_add_plugin(QMacStylePlugin
|
||||||
|
OUTPUT_NAME qmacstyle
|
||||||
|
TYPE styles
|
||||||
|
SOURCES
|
||||||
|
main.mm
|
||||||
|
qmacstyle_mac.mm qmacstyle_mac_p.h
|
||||||
|
qmacstyle_mac_p_p.h
|
||||||
|
LIBRARIES
|
||||||
|
${FWAppKit}
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::Core
|
||||||
|
Qt::Gui
|
||||||
|
Qt::WidgetsPrivate
|
||||||
|
)
|
||||||
|
|
||||||
|
#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>:
|
||||||
|
# DISTFILES = "macstyle.json"
|
@ -42,6 +42,7 @@ qt_internal_add_module(Bootstrap
|
|||||||
../../3rdparty/pcre2/src/pcre2_valid_utf.c
|
../../3rdparty/pcre2/src/pcre2_valid_utf.c
|
||||||
../../3rdparty/pcre2/src/pcre2_xclass.c
|
../../3rdparty/pcre2/src/pcre2_xclass.c
|
||||||
../../corelib/global/qendian.cpp
|
../../corelib/global/qendian.cpp
|
||||||
|
../../corelib/global/qfloat16.cpp
|
||||||
../../corelib/global/qglobal.cpp
|
../../corelib/global/qglobal.cpp
|
||||||
../../corelib/global/qlogging.cpp
|
../../corelib/global/qlogging.cpp
|
||||||
../../corelib/global/qmalloc.cpp
|
../../corelib/global/qmalloc.cpp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user