1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Regenerate projects

Browse Source 
Change-Id: I0cd4f34b0df0227789805f30f474ff6aa275078f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Alexandru Croitor 2020-03-16 13:45:53 +01:00
parent 77885f8402
commit 3c7c60e322
7 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.cmake
View File

@ -129,8 +129,8 @@ int main(int argc, char **argv)
qt_config_compile_test("separate_debug_info" qt_config_compile_test("separate_debug_info"
LABEL "separate debug information support" LABEL "separate debug information support"
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info") PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info")
# signaling_nan # signaling_nan
qt_config_compile_test(signaling_nan qt_config_compile_test(signaling_nan
LABEL "Signaling NaN for doubles" LABEL "Signaling NaN for doubles"

2
src/3rdparty/pcre2/CMakeLists.txt vendored
View File

@ -56,7 +56,7 @@ qt_extend_target(BundledPcre2 CONDITION WIN32
PCRE2_STATIC PCRE2_STATIC
) )
qt_extend_target(BundledPcre2 CONDITION UIKIT OR QNX OR WINRT qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT OR WINRT
DEFINES DEFINES
PCRE2_DISABLE_JIT PCRE2_DISABLE_JIT
) )

19
src/corelib/.prev_CMakeLists.txt
View File

@ -658,7 +658,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
tools/qtimeline.cpp tools/qtimeline.h tools/qtimeline.cpp tools/qtimeline.h
) )
qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT MACOS OR NOT ICC) qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
LIBRARIES LIBRARIES
m m
) )
@ -1100,20 +1100,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data
# mimedb.output = "$$outpath/qmimeprovider_database.cpp" # mimedb.output = "$$outpath/qmimeprovider_database.cpp"
# mimedb.variable_out = "INCLUDED_SOURCES" # mimedb.variable_out = "INCLUDED_SOURCES"
#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): #### Keys ignored in scope 199:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
# outpath = ".rcc/debug" # outpath = "$$outpath/$${QT_ARCH}"
#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else: #### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
# outpath = ".rcc/release" # outpath = "$$outpath/debug"
#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY: #### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:else:
# outpath = "$$outpath/release"
#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)" # mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1" # mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else: #### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:else:
# mimedb.commands = "perl" "$${mimedb.depends}" # mimedb.commands = "perl" "$${mimedb.depends}"
#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: #### Keys ignored in scope 205:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
# mimedb.commands = "--zstd" # mimedb.commands = "--zstd"
qt_extend_target(Core CONDITION WASM qt_extend_target(Core CONDITION WASM

19
src/corelib/CMakeLists.txt
View File

@ -761,7 +761,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
tools/qtimeline.cpp tools/qtimeline.h tools/qtimeline.cpp tools/qtimeline.h
) )
qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT MACOS OR NOT ICC) qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT ICC OR NOT MACOS)
LIBRARIES LIBRARIES
m m
) )
@ -1205,20 +1205,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
# mimedb.output = "$$outpath/qmimeprovider_database.cpp" # mimedb.output = "$$outpath/qmimeprovider_database.cpp"
# mimedb.variable_out = "INCLUDED_SOURCES" # mimedb.variable_out = "INCLUDED_SOURCES"
#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): #### Keys ignored in scope 199:.:mimetypes:mimetypes/mimetypes.pri:ANDROID:
# outpath = ".rcc/debug" # outpath = "$$outpath/$${QT_ARCH}"
#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else: #### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
# outpath = ".rcc/release" # outpath = "$$outpath/debug"
#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY: #### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:else:
# outpath = "$$outpath/release"
#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)" # mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1" # mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else: #### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:else:
# mimedb.commands = "perl" "$${mimedb.depends}" # mimedb.commands = "perl" "$${mimedb.depends}"
#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: #### Keys ignored in scope 205:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
# mimedb.commands = "--zstd" # mimedb.commands = "--zstd"
# Resources: # Resources:
# special case begin # special case begin

4
src/gui/.prev_CMakeLists.txt
View File

@ -517,12 +517,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h text/qcssparser.cpp text/qcssparser_p.h
) )
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
DEFINES DEFINES
ENABLE_PIXMAN_DRAWHELPERS ENABLE_PIXMAN_DRAWHELPERS
) )
if(UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")) if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT)
qt_add_simd_part(Gui SIMD neon qt_add_simd_part(Gui SIMD neon
SOURCES SOURCES
../3rdparty/pixman/pixman-arm-neon-asm.S ../3rdparty/pixman/pixman-arm-neon-asm.S

4
src/gui/CMakeLists.txt
View File

@ -622,12 +622,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h text/qcssparser.cpp text/qcssparser_p.h
) )
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT
DEFINES DEFINES
ENABLE_PIXMAN_DRAWHELPERS ENABLE_PIXMAN_DRAWHELPERS
) )
if(UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")) if(UNIX AND NOT ANDROID AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") AND NOT UIKIT)
qt_add_simd_part(Gui SIMD neon qt_add_simd_part(Gui SIMD neon
SOURCES SOURCES
../3rdparty/pixman/pixman-arm-neon-asm.S ../3rdparty/pixman/pixman-arm-neon-asm.S

2
src/network/configure.cmake
View File

@ -444,7 +444,7 @@ qt_configure_end_summary_section() # end of "Qt Network" section
qt_configure_add_report_entry( qt_configure_add_report_entry(
TYPE NOTE TYPE NOTE
MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked" MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND OpenSSL_FOUND.source NOT = 0 AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND TEST_openssl.source NOT = 0 AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME
) )
qt_configure_add_report_entry( qt_configure_add_report_entry(
TYPE WARNING TYPE WARNING