Fix static build with qt3rdparty libs

Make fixes for cmake builds, where we need to use
config("<foo_lib>_from_qt") as we do not know
include paths in time of cmake configure run,
but during build time.

Task-number: QTBUG-87154
Task-number: QTBUG-88614
Change-Id: I27a9a164c148434606bc0e45a8e996257a80b88f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 13 insertions, 37 deletions

diff --git a/chromium/build/config/freetype/BUILD.gn b/chromium/build/config/freetype/BUILD.gn
index 1da7a5daf48..5f1339037f4 100644
--- a/chromium/build/config/freetype/BUILD.gn
+++ b/chromium/build/config/freetype/BUILD.gn
@@ -9,7 +9,7 @@ group("freetype") {
   if (use_system_freetype) {
     public_configs = [ "//third_party/freetype:freetype_from_pkgconfig" ]
   } else if (use_qt_freetype) {
-    public_configs = [ "//third_party/freetype:freetype_from_qt" ]
+    public_configs = [ qt_freetype_config ]
   } else {
     public_deps = [ "//third_party:freetype_harfbuzz" ]
   }
diff --git a/chromium/build/config/freetype/freetype.gni b/chromium/build/config/freetype/freetype.gni
index fdf0f1522e7..7ec4f2aa427 100644
--- a/chromium/build/config/freetype/freetype.gni
+++ b/chromium/build/config/freetype/freetype.gni
@@ -12,5 +12,5 @@ declare_args() {
   # RENDERING AND SECURITY REGRESSIONS.
   use_system_freetype = false
   use_qt_freetype = false
-  qt_freetype_includes = ""
+  qt_freetype_config = ""
 }
diff --git a/chromium/third_party/BUILD.gn b/chromium/third_party/BUILD.gn
index 087f4694a16..c9917768195 100644
--- a/chromium/third_party/BUILD.gn
+++ b/chromium/third_party/BUILD.gn
@@ -31,13 +31,8 @@ if (use_system_libjpeg) {
   }
 } else if (use_qt_libjpeg) {
   # we do need shim since pdfium just includes 'system' headers
-  config ("qt_libjpeg_config") {
-    include_dirs  = string_split(qt_libjpeg_includes)
-  }
   source_set("qt_libjpeg") {
-    public_configs = [ ":qt_libjpeg_config",
-                       ":system_libjpeg_config"
-    ]
+    public_configs = [ qt_libjpeg_config, ":system_libjpeg_config"]
   }
 }
 
@@ -89,14 +84,14 @@ component("freetype_harfbuzz") {
   if (use_system_freetype) {
     public_configs += [ "//third_party/freetype:freetype_from_pkgconfig" ]
   } else if (use_qt_freetype) {
-    public_configs += [ "//third_party/freetype:freetype_from_qt" ]
+    public_configs += [ qt_freetype_config ]
   } else {
     public_deps += [ "//third_party/freetype:freetype_source" ]
   }
   if (use_system_harfbuzz) {
     public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
   } else if (use_qt_harfbuzz) {
-    public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_qt" ]
+    public_configs += [ qt_harfbuzz_config ]
   } else {
     public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ]
   }
diff --git a/chromium/third_party/freetype/BUILD.gn b/chromium/third_party/freetype/BUILD.gn
index db1762bc120..2cb05a89c44 100644
--- a/chromium/third_party/freetype/BUILD.gn
+++ b/chromium/third_party/freetype/BUILD.gn
@@ -22,13 +22,7 @@ if (use_system_freetype) {
     packages = [ "freetype2" ]
   }
 } else if (use_qt_freetype) {
-   config("freetype_from_qt") {
-     visibility = [
-       "//third_party:freetype_harfbuzz",
-       "//third_party/harfbuzz-ng:harfbuzz_source",
-     ]
-     include_dirs = [ qt_freetype_includes ]
-   }
+  # see root BUILD.gn
 } else {
 
 assert(!use_system_freetype, "Not used when using system freetype.")
@@ -173,7 +167,7 @@ source_set("freetype_source") {
   if (use_system_harfbuzz) {
     configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
   } else if (use_qt_harfbuzz) {
-    configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_qt" ]
+    configs += [ qt_harfbuzz_config ]
   } else {
     configs += [ "//third_party/harfbuzz-ng:harfbuzz_config" ]
   }
diff --git a/chromium/third_party/harfbuzz-ng/BUILD.gn b/chromium/third_party/harfbuzz-ng/BUILD.gn
index 73d59562f3d..71a4a75a24f 100644
--- a/chromium/third_party/harfbuzz-ng/BUILD.gn
+++ b/chromium/third_party/harfbuzz-ng/BUILD.gn
@@ -23,13 +23,7 @@ if (use_system_harfbuzz) {
     ]
   }
 } else if (use_qt_harfbuzz) {
-  config("harfbuzz_from_qt") {
-    visibility = [
-      "//third_party:freetype_harfbuzz",
-      "//third_party/freetype:freetype_source",
-    ]
-    include_dirs = [ qt_harfbuzz_includes ]
-  }
+  # see root BUILD.gn
 } else {
   config("harfbuzz_config") {
     include_dirs = [ "src/src" ]
@@ -375,7 +369,7 @@ if (use_system_harfbuzz) {
     if (use_system_freetype) {
       configs += [ "//third_party/freetype:freetype_from_pkgconfig" ]
     } else if (use_qt_freetype) {
-      configs += [ "//third_party/freetype:freetype_from_qt" ]
+      configs += [ qt_freetype_config ]
     } else {
       configs += [ "//third_party/freetype:freetype_component_config" ]
     }
diff --git a/chromium/third_party/harfbuzz-ng/harfbuzz.gni b/chromium/third_party/harfbuzz-ng/harfbuzz.gni
index 4d1c2746ff6..7d04a386551 100644
--- a/chromium/third_party/harfbuzz-ng/harfbuzz.gni
+++ b/chromium/third_party/harfbuzz-ng/harfbuzz.gni
@@ -10,5 +10,5 @@ declare_args() {
   # ChromeOS can build against the system lib and keep binary sizes smaller.
   use_system_harfbuzz = false
   use_qt_harfbuzz = false
-  qt_harfbuzz_includes = ""
+  qt_harfbuzz_config = ""
 }
diff --git a/chromium/third_party/libjpeg.gni b/chromium/third_party/libjpeg.gni
index e6d7bef1d83..21a9a55ca6c 100644
--- a/chromium/third_party/libjpeg.gni
+++ b/chromium/third_party/libjpeg.gni
@@ -11,5 +11,5 @@ declare_args() {
   use_libjpeg_turbo = true
 
   use_qt_libjpeg = false
-  qt_libjpeg_includes = ""
+  qt_libjpeg_config = ""
 }
diff --git a/chromium/third_party/pdfium/pdfium.gni b/chromium/third_party/pdfium/pdfium.gni
index ccdc0a2efbb..3437591f298 100644
--- a/chromium/third_party/pdfium/pdfium.gni
+++ b/chromium/third_party/pdfium/pdfium.gni
@@ -72,7 +72,7 @@ declare_args() {
   msvc_use_sse2 = true
 
   pdfium_use_qt_libpng = false
-  pdfium_qt_libpng_includes = ""
+  qt_libpng_config = ""
 }
 
 if (pdf_use_skia && pdf_use_skia_paths) {
diff --git a/chromium/third_party/pdfium/third_party/BUILD.gn b/chromium/third_party/pdfium/third_party/BUILD.gn
index 78e706beb50..312879124f0 100644
--- a/chromium/third_party/pdfium/third_party/BUILD.gn
+++ b/chromium/third_party/pdfium/third_party/BUILD.gn
@@ -426,18 +426,11 @@ config("system_libpng_config") {
   defines = [ "USE_SYSTEM_LIBPNG" ]
 }
 
-if(pdfium_use_qt_libpng) {
-  config("qt_libpng_config") {
-    include_dirs = [ pdfium_qt_libpng_includes ]
-    defines = [ "USE_SYSTEM_LIBPNG" ]
-  }
-}
-
 group("png") {
   if (pdfium_use_system_libpng) {
     public_configs = [ ":system_libpng_config" ]
   } else if (pdfium_use_qt_libpng) {
-    public_configs = [ ":qt_libpng_config" ]
+    public_configs = [ qt_libpng_config ]
   } else {
     public_deps = [ ":fx_lpng" ]
   }