OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision5d12c835cd3f1c7118965ac45c695af2f0f27a02 (tree)
Time2023-01-17 09:57:31
AuthorFs <Fsu0413@vip....>
CommiterFs

Log Message

disable build of grpc on all config, also disable webengine on static full builds

Signed-off-by: Fs <Fsu0413@vip.qq.com>

Change Summary

Incremental Difference

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -4622,6 +4622,7 @@ conf.q6_5wx6v2 = {
46224622 -DFEATURE_system_sqlite=OFF
46234623 -DFEATURE_webengine_proprietary_codecs=ON
46244624 -DFEATURE_qtpdf_build=ON
4625+ -DBUILD_qtgrpc=OFF
46254626 -DBUILD_qtopcua=OFF
46264627 ]],
46274628 }
@@ -4725,7 +4726,9 @@ conf.q6_5wx6v2sf = {
47254726 -DFEATURE_sql_sqlite=ON
47264727 -DFEATURE_sql_odbc=ON
47274728 -DFEATURE_system_sqlite=OFF
4729+ -DBUILD_qtgrpc=OFF
47284730 -DBUILD_qtopcua=OFF
4731+ -DBUILD_qtwebengine=OFF
47294732 ]],
47304733 }
47314734
@@ -4761,6 +4764,7 @@ conf.q6_5wx6v2_wa6v2 = {
47614764 -DFEATURE_sql_sqlite=ON
47624765 -DFEATURE_sql_odbc=ON
47634766 -DFEATURE_system_sqlite=OFF
4767+ -DBUILD_qtgrpc=OFF
47644768 -DBUILD_qtopcua=OFF
47654769 ]],
47664770 }
@@ -4795,6 +4799,7 @@ conf.q6_5wx6g2 = {
47954799 -DFEATURE_sql_sqlite=ON
47964800 -DFEATURE_sql_odbc=ON
47974801 -DFEATURE_system_sqlite=OFF
4802+ -DBUILD_qtgrpc=OFF
47984803 -DBUILD_qtopcua=OFF
47994804 ]],
48004805 }
@@ -4898,7 +4903,9 @@ conf.q6_5wx6g2sf = {
48984903 -DFEATURE_sql_sqlite=ON
48994904 -DFEATURE_sql_odbc=ON
49004905 -DFEATURE_system_sqlite=OFF
4906+ -DBUILD_qtgrpc=OFF
49014907 -DBUILD_qtopcua=OFF
4908+ -DBUILD_qtwebengine=OFF
49024909 ]],
49034910 }
49044911
@@ -4932,8 +4939,9 @@ conf.q6_5wx6u5 = {
49324939 -DFEATURE_sql_sqlite=ON
49334940 -DFEATURE_sql_odbc=ON
49344941 -DFEATURE_system_sqlite=OFF
4935- -DBUILD_qtwebengine=OFF
4942+ -DBUILD_qtgrpc=OFF
49364943 -DBUILD_qtopcua=OFF
4944+ -DBUILD_qtwebengine=OFF
49374945 -DCMAKE_C_COMPILER="x86_64-w64-mingw32-clang"
49384946 -DCMAKE_ASM_COMPILER="x86_64-w64-mingw32-clang"
49394947 -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-clang++"
@@ -4970,8 +4978,9 @@ conf.q6_5wx6s5 = {
49704978 -DFEATURE_sql_sqlite=ON
49714979 -DFEATURE_sql_odbc=ON
49724980 -DFEATURE_system_sqlite=OFF
4973- -DBUILD_qtwebengine=OFF
4981+ -DBUILD_qtgrpc=OFF
49744982 -DBUILD_qtopcua=OFF
4983+ -DBUILD_qtwebengine=OFF
49754984 -DCMAKE_C_COMPILER="x86_64-w64-mingw32-clang"
49764985 -DCMAKE_ASM_COMPILER="x86_64-w64-mingw32-clang"
49774986 -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-clang++"
@@ -5072,6 +5081,7 @@ conf.q6_5mal = {
50725081 -DCMAKE_SKIP_BUILD_RPATH=OFF
50735082 -DCMAKE_SKIP_INSTALL_RPATH=OFF
50745083 -DFEATURE_framework=ON
5084+ -DBUILD_qtgrpc=OFF
50755085 -DBUILD_qtopcua=OFF
50765086 ]],
50775087 }
@@ -5112,6 +5122,7 @@ conf.q6_5malnf = {
51125122 -DCMAKE_SKIP_BUILD_RPATH=OFF
51135123 -DCMAKE_SKIP_INSTALL_RPATH=OFF
51145124 -DFEATURE_framework=OFF
5125+ -DBUILD_qtgrpc=OFF
51155126 -DBUILD_qtopcua=OFF
51165127 ]],
51175128 }
@@ -5215,7 +5226,9 @@ conf.q6_5malsf = {
52155226 -DFEATURE_securetransport=ON
52165227 -DFEATURE_sql_sqlite=ON
52175228 -DFEATURE_system_sqlite=OFF
5229+ -DBUILD_qtgrpc=OFF
52185230 -DBUILD_qtopcua=OFF
5231+ -DBUILD_qtwebengine=OFF
52195232 ]],
52205233 }
52215234
@@ -5248,6 +5261,7 @@ conf.q6_5wx6g2_aa6n5 = {
52485261 -DINPUT_openssl=linked
52495262 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&
52505263 -DFEATURE_sql_sqlite=ON
5264+ -DBUILD_qtgrpc=OFF
52515265 -DBUILD_qtopcua=OFF
52525266 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
52535267 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&\build\cmake\android.toolchain.cmake
@@ -5287,6 +5301,7 @@ conf.q6_5wx6g2_ax6n5 = {
52875301 -DINPUT_openssl=linked
52885302 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&
52895303 -DFEATURE_sql_sqlite=ON
5304+ -DBUILD_qtgrpc=OFF
52905305 -DBUILD_qtopcua=OFF
52915306 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
52925307 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&\build\cmake\android.toolchain.cmake
@@ -5325,6 +5340,7 @@ conf.q6_5lx6_aa6n5 = {
53255340 -DINPUT_openssl=linked
53265341 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
53275342 -DFEATURE_sql_sqlite=ON
5343+ -DBUILD_qtgrpc=OFF
53285344 -DBUILD_qtopcua=OFF
53295345 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
53305346 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
@@ -5362,6 +5378,7 @@ conf.q6_5lx6_ax6n5 = {
53625378 -DINPUT_openssl=linked
53635379 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
53645380 -DFEATURE_sql_sqlite=ON
5381+ -DBUILD_qtgrpc=OFF
53655382 -DBUILD_qtopcua=OFF
53665383 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
53675384 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
@@ -5399,6 +5416,7 @@ conf.q6_5mal_aa6n5 = {
53995416 -DINPUT_openssl=linked
54005417 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
54015418 -DFEATURE_sql_sqlite=ON
5419+ -DBUILD_qtgrpc=OFF
54025420 -DBUILD_qtopcua=OFF
54035421 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
54045422 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
@@ -5436,6 +5454,7 @@ conf.q6_5mal_ax6n5 = {
54365454 -DINPUT_openssl=linked
54375455 -DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
54385456 -DFEATURE_sql_sqlite=ON
5457+ -DBUILD_qtgrpc=OFF
54395458 -DBUILD_qtopcua=OFF
54405459 -DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
54415460 -DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
@@ -5473,6 +5492,7 @@ conf.q6_5wx6g2_W = {
54735492 -DFEATURE_opengles2=ON
54745493 -DFEATURE_ssl=OFF
54755494 -DFEATURE_sql_sqlite=ON
5495+ -DBUILD_qtgrpc=OFF
54765496 -DBUILD_qtopcua=OFF
54775497 ]],
54785498 }
@@ -5503,6 +5523,7 @@ conf.q6_5lx6_W = {
55035523 -DFEATURE_opengles2=ON
55045524 -DFEATURE_ssl=OFF
55055525 -DFEATURE_sql_sqlite=ON
5526+ -DBUILD_qtgrpc=OFF
55065527 -DBUILD_qtopcua=OFF
55075528 ]],
55085529 }
@@ -5533,6 +5554,7 @@ conf.q6_5mal_W = {
55335554 -DFEATURE_opengles2=ON
55345555 -DFEATURE_ssl=OFF
55355556 -DFEATURE_sql_sqlite=ON
5557+ -DBUILD_qtgrpc=OFF
55365558 -DBUILD_qtopcua=OFF
55375559 ]],
55385560 }