1 files changed, 18 insertions, 7 deletions
diff --git a/src/pdf/configure/BUILD.root.gn.in b/src/pdf/configure/BUILD.root.gn.in
index 5420e8581..e9f54ed6d 100644
--- a/src/pdf/configure/BUILD.root.gn.in
+++ b/src/pdf/configure/BUILD.root.gn.in
@@ -39,24 +39,35 @@ config("QtPdf_config") {
   ]
 }
 
-config("cpp17_config") {
-  # static initialized constexpr expressions must be compiled always as c++14 or always as c++17
-  # and our qtwebengine core sources use them as c++17
+config("cpp20_config") {
+  # Chromium headers now use concepts and requires c++20
   if (is_win) {
-    cflags_cc = [ "/std:c++17" ]
+    cflags_cc = [ "/std:c++20" ]
   } else {
-    cflags_cc = [ "-std=c++17" ]
+    cflags_cc = [ "-std=c++20" ]
   }
 }
 
 static_library("QtPdf") {
   complete_static_lib = true
-  rsp_types = [ "objects", "archives", "libs" ]
+  rsp_types = [ "objects", "archives", "libs", "ldir" ]
   configs += [
-    ":cpp17_config",
+    ":cpp20_config",
     ":QtPdf_config"
   ]
   deps = [
     "//third_party/pdfium"
   ]
+  if (is_msvc) {
+    libs = [
+      "dloadhelper.lib",
+      "winmm.lib",
+      "usp10.lib",
+    ]
+  }
+  if (is_mingw) {
+    libs = [
+      "winmm",
+    ]
+  }
 }