[linux-x86_64-nowebengine] Custom build with glibc 2.27 sysroot.
Used a docker image with ubuntu:18.04 to build Qt6 with glibc 2.27.
Bug: 327452458
Test: presubmit
Change-Id: I7b124154fbcc70e4c42525ba093b3aff9e59c7c0
diff --git a/linux-x86_64-nowebengine/bin/androiddeployqt b/linux-x86_64-nowebengine/bin/androiddeployqt
index 736dd83..3dd7732 100755
--- a/linux-x86_64-nowebengine/bin/androiddeployqt
+++ b/linux-x86_64-nowebengine/bin/androiddeployqt
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/androiddeployqt6 b/linux-x86_64-nowebengine/bin/androiddeployqt6
index 736dd83..3dd7732 100755
--- a/linux-x86_64-nowebengine/bin/androiddeployqt6
+++ b/linux-x86_64-nowebengine/bin/androiddeployqt6
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/androidtestrunner b/linux-x86_64-nowebengine/bin/androidtestrunner
index 9529ca7..b14591b 100755
--- a/linux-x86_64-nowebengine/bin/androidtestrunner
+++ b/linux-x86_64-nowebengine/bin/androidtestrunner
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qdbuscpp2xml b/linux-x86_64-nowebengine/bin/qdbuscpp2xml
index 8036407..1607fa0 100755
--- a/linux-x86_64-nowebengine/bin/qdbuscpp2xml
+++ b/linux-x86_64-nowebengine/bin/qdbuscpp2xml
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qdbusxml2cpp b/linux-x86_64-nowebengine/bin/qdbusxml2cpp
index dfa6675..2b95a71 100755
--- a/linux-x86_64-nowebengine/bin/qdbusxml2cpp
+++ b/linux-x86_64-nowebengine/bin/qdbusxml2cpp
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qmake b/linux-x86_64-nowebengine/bin/qmake
index dd48139..d177885 100755
--- a/linux-x86_64-nowebengine/bin/qmake
+++ b/linux-x86_64-nowebengine/bin/qmake
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qmake6 b/linux-x86_64-nowebengine/bin/qmake6
index dd48139..d177885 100755
--- a/linux-x86_64-nowebengine/bin/qmake6
+++ b/linux-x86_64-nowebengine/bin/qmake6
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qt-cmake b/linux-x86_64-nowebengine/bin/qt-cmake
index 7d3f6dd..89376bd 100755
--- a/linux-x86_64-nowebengine/bin/qt-cmake
+++ b/linux-x86_64-nowebengine/bin/qt-cmake
@@ -5,7 +5,7 @@
script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
-original_cmake_path="/buildbot/src/android/emu-prebuilts/prebuilts/cmake/linux-x86/bin/cmake"
+original_cmake_path="/emu-prebuilts/prebuilts/cmake/linux-x86/bin/cmake"
cmake_path=$original_cmake_path
if ! test -f "$cmake_path"; then
cmake_path="cmake"
diff --git a/linux-x86_64-nowebengine/bin/qtpaths b/linux-x86_64-nowebengine/bin/qtpaths
index 52fd354..54759b2 100755
--- a/linux-x86_64-nowebengine/bin/qtpaths
+++ b/linux-x86_64-nowebengine/bin/qtpaths
Binary files differ
diff --git a/linux-x86_64-nowebengine/bin/qtpaths6 b/linux-x86_64-nowebengine/bin/qtpaths6
index 52fd354..54759b2 100755
--- a/linux-x86_64-nowebengine/bin/qtpaths6
+++ b/linux-x86_64-nowebengine/bin/qtpaths6
Binary files differ
diff --git a/linux-x86_64-nowebengine/include/QtCore/6.5.3/QtCore/private/qtcore-config_p.h b/linux-x86_64-nowebengine/include/QtCore/6.5.3/QtCore/private/qtcore-config_p.h
index a78306a..d55dedc 100644
--- a/linux-x86_64-nowebengine/include/QtCore/6.5.3/QtCore/private/qtcore-config_p.h
+++ b/linux-x86_64-nowebengine/include/QtCore/6.5.3/QtCore/private/qtcore-config_p.h
@@ -28,7 +28,7 @@
#define QT_FEATURE_mimetype_database 1
-#define QT_FEATURE_system_pcre2 1
+#define QT_FEATURE_system_pcre2 -1
#define QT_FEATURE_poll_ppoll 1
@@ -40,11 +40,11 @@
#define QT_FEATURE_qqnx_pps -1
-#define QT_FEATURE_renameat2 1
+#define QT_FEATURE_renameat2 -1
#define QT_FEATURE_slog2 -1
-#define QT_FEATURE_statx 1
+#define QT_FEATURE_statx -1
#define QT_FEATURE_syslog -1
diff --git a/linux-x86_64-nowebengine/lib/cmake/Qt6/FindWrapBundledPcre2ConfigExtra.cmake b/linux-x86_64-nowebengine/lib/cmake/Qt6/FindWrapBundledPcre2ConfigExtra.cmake
index ee0006d..fdba2d1 100644
--- a/linux-x86_64-nowebengine/lib/cmake/Qt6/FindWrapBundledPcre2ConfigExtra.cmake
+++ b/linux-x86_64-nowebengine/lib/cmake/Qt6/FindWrapBundledPcre2ConfigExtra.cmake
@@ -1 +1 @@
-set(QT_USE_BUNDLED_BundledPcre2 OFF CACHE INTERNAL "")
+set(QT_USE_BUNDLED_BundledPcre2 ON CACHE INTERNAL "")
diff --git a/linux-x86_64-nowebengine/lib/cmake/Qt6/qt.toolchain.cmake b/linux-x86_64-nowebengine/lib/cmake/Qt6/qt.toolchain.cmake
index 7df4e00..2443930 100644
--- a/linux-x86_64-nowebengine/lib/cmake/Qt6/qt.toolchain.cmake
+++ b/linux-x86_64-nowebengine/lib/cmake/Qt6/qt.toolchain.cmake
@@ -28,8 +28,8 @@
set(QT_QMAKE_TARGET_MKSPEC linux-clang-libc++ CACHE STRING "")
endif()
-set(__qt_initial_c_compiler "/buildbot/src/android/emu-prebuilts/out/build-qt/toolchain/clang")
-set(__qt_initial_cxx_compiler "/buildbot/src/android/emu-prebuilts/out/build-qt/toolchain/clang++")
+set(__qt_initial_c_compiler "/emu-prebuilts/out-prebuilts/build-qt/toolchain/clang")
+set(__qt_initial_cxx_compiler "/emu-prebuilts/out-prebuilts/build-qt/toolchain/clang++")
if(NOT DEFINED CMAKE_C_COMPILER AND EXISTS "${__qt_initial_c_compiler}")
set(CMAKE_C_COMPILER "${__qt_initial_c_compiler}" CACHE STRING "")
endif()
diff --git a/linux-x86_64-nowebengine/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake b/linux-x86_64-nowebengine/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake
index 2722f68..1626a08 100644
--- a/linux-x86_64-nowebengine/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake
+++ b/linux-x86_64-nowebengine/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake
@@ -42,7 +42,7 @@
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND
NOT QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX
AND NOT QT_SUPERBUILD)
- set(qtbi_orig_prefix "/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine")
+ set(qtbi_orig_prefix "/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine")
set(qtbi_orig_staging_prefix "")
qt_internal_new_prefix(qtbi_new_prefix
"${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}"
@@ -74,7 +74,7 @@
set(QT_WILL_INSTALL ON CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
-set(QT_SOURCE_TREE "/buildbot/src/android/emu-prebuilts/external/qt5/qtbase" CACHE PATH
+set(QT_SOURCE_TREE "/emu-prebuilts/external/qt5/qtbase" CACHE PATH
"A path to the source tree of the previously configured QtBase project." FORCE)
# Propagate decision of building tests and examples to other repositories.
diff --git a/linux-x86_64-nowebengine/lib/cmake/Qt6Core/Qt6CoreTargets.cmake b/linux-x86_64-nowebengine/lib/cmake/Qt6Core/Qt6CoreTargets.cmake
index be4aaf9..7377c5c 100644
--- a/linux-x86_64-nowebengine/lib/cmake/Qt6Core/Qt6CoreTargets.cmake
+++ b/linux-x86_64-nowebengine/lib/cmake/Qt6Core/Qt6CoreTargets.cmake
@@ -62,9 +62,9 @@
INTERFACE_QT_COORD_TYPE "double"
INTERFACE_QT_MAJOR_VERSION "6"
INTERFACE_SOURCES "\$<\$<BOOL:\$<TARGET_PROPERTY:QT_CONSUMES_METATYPES>>:${_IMPORT_PREFIX}/./metatypes/qt6core_relwithdebinfo_metatypes.json>"
- QT_DISABLED_PRIVATE_FEATURES "system_doubleconversion;glib;icu;journald;system_libb2;poll_pollts;poll_poll;poll_select;qqnx_pps;slog2;syslog;cpp_winrt;lttng;etw;ctf;poll_exit_on_error;use_bfd_linker;use_gold_linker;use_mold_linker;android_style_assets;gc_binaries;developer_build;private_tests;debug;no_direct_extern_access;mips_dsp;mips_dspr2;neon;arm_crc32;arm_crypto;alloca_malloc_h;stack_protector_strong;stdlib_libcpp;printsupport;libudev;openssl;intelcet"
+ QT_DISABLED_PRIVATE_FEATURES "system_doubleconversion;glib;icu;journald;system_libb2;system_pcre2;poll_pollts;poll_poll;poll_select;qqnx_pps;renameat2;slog2;statx;syslog;cpp_winrt;lttng;etw;ctf;poll_exit_on_error;use_bfd_linker;use_gold_linker;use_mold_linker;android_style_assets;gc_binaries;developer_build;private_tests;debug;no_direct_extern_access;mips_dsp;mips_dspr2;neon;arm_crc32;arm_crypto;alloca_malloc_h;stack_protector_strong;stdlib_libcpp;printsupport;libudev;openssl;intelcet"
QT_DISABLED_PUBLIC_FEATURES "glib;cpp_winrt;permissions;static;cross_compile;debug_and_release;separate_debug_info;appstore_compliant;simulator_and_device;rpath;force_asserts;framework;cxx20;cxx2a;cxx2b;cxx2b;wasm_simd128;wasm_exceptions;zstd;openssl_linked;opensslv11;opensslv30"
- QT_ENABLED_PRIVATE_FEATURES "clock_gettime;doubleconversion;dladdr;futimens;getauxval;getentropy;glibc;inotify;linkat;mimetype_database;system_pcre2;poll_ppoll;renameat2;statx;backtrace;sha3_fast;hijricalendar;datetimeparser;forkfd_pidfd;pcre2;use_lld_linker;reduce_exports;x86intrin;sse2;sse3;ssse3;sse4_1;sse4_2;avx;f16c;avx2;avx512f;avx512er;avx512cd;avx512pf;avx512dq;avx512bw;avx512vl;avx512ifma;avx512vbmi;avx512vbmi2;aesni;vaes;rdrnd;rdseed;shani;posix_fallocate;alloca_h;alloca;system_zlib;dbus;dbus_linked;gui;network;sql;testlib;widgets;xml;dlopen;relocatable;use_lld_linker;force_debug_info;largefile;precompile_header;enable_new_dtags;sse2;sse3;ssse3;sse4_1;sse4_2;avx;f16c;avx2;avx512f;avx512er;avx512cd;avx512pf;avx512dq;avx512bw;avx512vl;avx512ifma;avx512vbmi;avx512vbmi2;aesni;vaes;rdrnd;rdseed;shani"
+ QT_ENABLED_PRIVATE_FEATURES "clock_gettime;doubleconversion;dladdr;futimens;getauxval;getentropy;glibc;inotify;linkat;mimetype_database;poll_ppoll;backtrace;sha3_fast;hijricalendar;datetimeparser;forkfd_pidfd;pcre2;use_lld_linker;reduce_exports;x86intrin;sse2;sse3;ssse3;sse4_1;sse4_2;avx;f16c;avx2;avx512f;avx512er;avx512cd;avx512pf;avx512dq;avx512bw;avx512vl;avx512ifma;avx512vbmi;avx512vbmi2;aesni;vaes;rdrnd;rdseed;shani;posix_fallocate;alloca_h;alloca;system_zlib;dbus;dbus_linked;gui;network;sql;testlib;widgets;xml;dlopen;relocatable;use_lld_linker;force_debug_info;largefile;precompile_header;enable_new_dtags;sse2;sse3;ssse3;sse4_1;sse4_2;avx;f16c;avx2;avx512f;avx512er;avx512cd;avx512pf;avx512dq;avx512bw;avx512vl;avx512ifma;avx512vbmi;avx512vbmi2;aesni;vaes;rdrnd;rdseed;shani"
QT_ENABLED_PUBLIC_FEATURES "clock_monotonic;doubleconversion;cxx11_future;cxx17_filesystem;eventfd;inotify;std_atomic64;mimetype;regularexpression;sharedmemory;shortcut;systemsemaphore;xmlstream;xmlstreamreader;xmlstreamwriter;textdate;datestring;process;processenvironment;temporaryfile;library;settings;filesystemwatcher;filesystemiterator;itemmodel;proxymodel;sortfilterproxymodel;identityproxymodel;transposeproxymodel;concatenatetablesproxymodel;stringlistmodel;translation;easingcurve;animation;gestures;jalalicalendar;islamiccivilcalendar;timezone;commandlineparser;cborstreamreader;cborstreamwriter;threadsafe_cloexec;shared;pkg_config;cxx11;cxx14;cxx17;cxx1z;c99;c11;reduce_relocations;signaling_nan;thread;future;concurrent;dbus;shared;plugin_manifest;shared;cxx11;cxx14;cxx17;cxx1z;reduce_exports;reduce_relocations"
QT_QMAKE_PRIVATE_CONFIG "pcre2;use_lld_linker;force_debug_info;largefile;precompile_header;enable_new_dtags;sse2;sse3;ssse3;sse4_1;sse4_2;avx;f16c;avx2;avx512f;avx512er;avx512cd;avx512pf;avx512dq;avx512bw;avx512vl;avx512ifma;avx512vbmi;avx512vbmi2;aesni;vaes;rdrnd;rdseed;shani"
QT_QMAKE_PUBLIC_CONFIG "shared;plugin_manifest"
diff --git a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so
index 5abf147..c0d1658 100644
--- a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6
index 5abf147..c0d1658 100644
--- a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6.5.3
index 5abf147..c0d1658 100644
--- a/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6ConcurrentAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so
index d7baaec..3df8ad4 100644
--- a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6
index d7baaec..3df8ad4 100644
--- a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6.5.3
index d7baaec..3df8ad4 100644
--- a/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6CoreAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so
index 49b653b..7c66c14 100644
--- a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6
index 49b653b..7c66c14 100644
--- a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6.5.3
index 49b653b..7c66c14 100644
--- a/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6DBusAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6DeviceDiscoverySupportAndroidEmu.a b/linux-x86_64-nowebengine/lib/libQt6DeviceDiscoverySupportAndroidEmu.a
index 55258d1..f9ebba2 100644
--- a/linux-x86_64-nowebengine/lib/libQt6DeviceDiscoverySupportAndroidEmu.a
+++ b/linux-x86_64-nowebengine/lib/libQt6DeviceDiscoverySupportAndroidEmu.a
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6FbSupportAndroidEmu.a b/linux-x86_64-nowebengine/lib/libQt6FbSupportAndroidEmu.a
index ba18ebd..00977c6 100644
--- a/linux-x86_64-nowebengine/lib/libQt6FbSupportAndroidEmu.a
+++ b/linux-x86_64-nowebengine/lib/libQt6FbSupportAndroidEmu.a
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so
index 285702d..54c54a2 100644
--- a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6
index 285702d..54c54a2 100644
--- a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6.5.3
index 285702d..54c54a2 100644
--- a/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6GuiAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6InputSupportAndroidEmu.a b/linux-x86_64-nowebengine/lib/libQt6InputSupportAndroidEmu.a
index 0a17163..b3369af 100644
--- a/linux-x86_64-nowebengine/lib/libQt6InputSupportAndroidEmu.a
+++ b/linux-x86_64-nowebengine/lib/libQt6InputSupportAndroidEmu.a
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6KmsSupportAndroidEmu.a b/linux-x86_64-nowebengine/lib/libQt6KmsSupportAndroidEmu.a
index eeff8ab..5a9796c 100644
--- a/linux-x86_64-nowebengine/lib/libQt6KmsSupportAndroidEmu.a
+++ b/linux-x86_64-nowebengine/lib/libQt6KmsSupportAndroidEmu.a
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so
index e37350b..aff6215 100644
--- a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6
index e37350b..aff6215 100644
--- a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6.5.3
index e37350b..aff6215 100644
--- a/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6NetworkAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so
index 112c1de..a5cd2c3 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6
index 112c1de..a5cd2c3 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6.5.3
index 112c1de..a5cd2c3 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6SqlAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so
index 61f450e..a16fa2b 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6
index 61f450e..a16fa2b 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6.5.3
index 61f450e..a16fa2b 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so
index 064cf59..f43c904 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6
index 064cf59..f43c904 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6.5.3
index 064cf59..f43c904 100644
--- a/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6SvgWidgetsAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so
index bbce0be..e61371d 100644
--- a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6
index bbce0be..e61371d 100644
--- a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6.5.3
index bbce0be..e61371d 100644
--- a/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6TestAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so
index b4a45d6..b315dbe 100644
--- a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6
index b4a45d6..b315dbe 100644
--- a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6.5.3
index b4a45d6..b315dbe 100644
--- a/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6WidgetsAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so
index b33d5f9..f05512a 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6
index b33d5f9..f05512a 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6.5.3
index b33d5f9..f05512a 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6XcbQpaAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so
index a16be16..12de80f 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so
+++ b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6 b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6
index a16be16..12de80f 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6
+++ b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6.5.3 b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6.5.3
index a16be16..12de80f 100644
--- a/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6.5.3
+++ b/linux-x86_64-nowebengine/lib/libQt6XmlAndroidEmu.so.6.5.3
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libX11-xcb.so.1 b/linux-x86_64-nowebengine/lib/libX11-xcb.so.1
index 3903cf4..744d2dd 100644
--- a/linux-x86_64-nowebengine/lib/libX11-xcb.so.1
+++ b/linux-x86_64-nowebengine/lib/libX11-xcb.so.1
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libXau.so.6 b/linux-x86_64-nowebengine/lib/libXau.so.6
index 44e16b2..302d9c1 100644
--- a/linux-x86_64-nowebengine/lib/libXau.so.6
+++ b/linux-x86_64-nowebengine/lib/libXau.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libXdmcp.so.6 b/linux-x86_64-nowebengine/lib/libXdmcp.so.6
index dd60046..026e758 100644
--- a/linux-x86_64-nowebengine/lib/libXdmcp.so.6
+++ b/linux-x86_64-nowebengine/lib/libXdmcp.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libfontconfig.so.1 b/linux-x86_64-nowebengine/lib/libfontconfig.so.1
index f14ece6..aa6f443 100644
--- a/linux-x86_64-nowebengine/lib/libfontconfig.so.1
+++ b/linux-x86_64-nowebengine/lib/libfontconfig.so.1
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libfreetype.so.6 b/linux-x86_64-nowebengine/lib/libfreetype.so.6
index 7988446..910bf85 100644
--- a/linux-x86_64-nowebengine/lib/libfreetype.so.6
+++ b/linux-x86_64-nowebengine/lib/libfreetype.so.6
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libpcre2-16.so.0 b/linux-x86_64-nowebengine/lib/libpcre2-16.so.0
deleted file mode 100644
index ca90e72..0000000
--- a/linux-x86_64-nowebengine/lib/libpcre2-16.so.0
+++ /dev/null
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-icccm.so.4 b/linux-x86_64-nowebengine/lib/libxcb-icccm.so.4
index 8adb622..b2a8977 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-icccm.so.4
+++ b/linux-x86_64-nowebengine/lib/libxcb-icccm.so.4
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-keysyms.so.1 b/linux-x86_64-nowebengine/lib/libxcb-keysyms.so.1
index c6b5afb..2883c98 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-keysyms.so.1
+++ b/linux-x86_64-nowebengine/lib/libxcb-keysyms.so.1
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-randr.so.0 b/linux-x86_64-nowebengine/lib/libxcb-randr.so.0
index 36d4786..9021cf0 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-randr.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-randr.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-render-util.so.0 b/linux-x86_64-nowebengine/lib/libxcb-render-util.so.0
index 7c6104d..0e52602 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-render-util.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-render-util.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-render.so.0 b/linux-x86_64-nowebengine/lib/libxcb-render.so.0
index a72e92a..04ffcd9 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-render.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-render.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-shape.so.0 b/linux-x86_64-nowebengine/lib/libxcb-shape.so.0
index ed202a1..c298c99 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-shape.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-shape.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-shm.so.0 b/linux-x86_64-nowebengine/lib/libxcb-shm.so.0
index ec9f6b4..747657f 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-shm.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-shm.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-sync.so.1 b/linux-x86_64-nowebengine/lib/libxcb-sync.so.1
index 47ac942..985f382 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-sync.so.1
+++ b/linux-x86_64-nowebengine/lib/libxcb-sync.so.1
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-xfixes.so.0 b/linux-x86_64-nowebengine/lib/libxcb-xfixes.so.0
index 4058795..d1b1096 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-xfixes.so.0
+++ b/linux-x86_64-nowebengine/lib/libxcb-xfixes.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxcb-xkb.so.1 b/linux-x86_64-nowebengine/lib/libxcb-xkb.so.1
index c860b2f..e8c5ad5 100644
--- a/linux-x86_64-nowebengine/lib/libxcb-xkb.so.1
+++ b/linux-x86_64-nowebengine/lib/libxcb-xkb.so.1
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxkbcommon-x11.so.0 b/linux-x86_64-nowebengine/lib/libxkbcommon-x11.so.0
index 62117d7..8e1a218 100644
--- a/linux-x86_64-nowebengine/lib/libxkbcommon-x11.so.0
+++ b/linux-x86_64-nowebengine/lib/libxkbcommon-x11.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/libxkbcommon.so.0 b/linux-x86_64-nowebengine/lib/libxkbcommon.so.0
index 44691c9..4c75e22 100644
--- a/linux-x86_64-nowebengine/lib/libxkbcommon.so.0
+++ b/linux-x86_64-nowebengine/lib/libxkbcommon.so.0
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o b/linux-x86_64-nowebengine/lib/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
index 602c2d4..e800720 100644
--- a/linux-x86_64-nowebengine/lib/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
+++ b/linux-x86_64-nowebengine/lib/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
Binary files differ
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Concurrent.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Concurrent.pc
index 874674c..4fefacd 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Concurrent.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Concurrent.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Core.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Core.pc
index 4dc6040..2040d9f 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Core.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Core.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6DBus.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6DBus.pc
index 8eb4698..0f79375 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6DBus.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6DBus.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Gui.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Gui.pc
index 388d301..50c7adb 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Gui.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Gui.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Network.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Network.pc
index 612db95..46190c9 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Network.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Network.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Platform.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Platform.pc
index 6a33cfa..c7f4081 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Platform.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Platform.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Sql.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Sql.pc
index b3fbd6f..ce58007 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Sql.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Sql.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Svg.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Svg.pc
index e62d7c1..89fee8e 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Svg.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Svg.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6SvgWidgets.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6SvgWidgets.pc
index 4192d12..f68d805 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6SvgWidgets.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6SvgWidgets.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Test.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Test.pc
index ee74131..ac25c25 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Test.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Test.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Widgets.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Widgets.pc
index ee3f10a..a7a25b8 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Widgets.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Widgets.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Xml.pc b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Xml.pc
index ff71bcf..bbda7a8 100644
--- a/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Xml.pc
+++ b/linux-x86_64-nowebengine/lib/pkgconfig/Qt6Xml.pc
@@ -1,4 +1,4 @@
-prefix=/buildbot/src/android/emu-prebuilts/out/prebuilts/qt-nowebengine
+prefix=/emu-prebuilts/out-prebuilts/prebuilts/qt-nowebengine
exec_prefix=${prefix}
bindir=${prefix}/bin
libexecdir=${prefix}/./libexec
diff --git a/linux-x86_64-nowebengine/libexec/cmake_automoc_parser b/linux-x86_64-nowebengine/libexec/cmake_automoc_parser
index 2b51a67..93bfe6b 100755
--- a/linux-x86_64-nowebengine/libexec/cmake_automoc_parser
+++ b/linux-x86_64-nowebengine/libexec/cmake_automoc_parser
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/moc b/linux-x86_64-nowebengine/libexec/moc
index 8d2dbb7..dee20df 100755
--- a/linux-x86_64-nowebengine/libexec/moc
+++ b/linux-x86_64-nowebengine/libexec/moc
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/qlalr b/linux-x86_64-nowebengine/libexec/qlalr
index 89c4025..cda43de 100755
--- a/linux-x86_64-nowebengine/libexec/qlalr
+++ b/linux-x86_64-nowebengine/libexec/qlalr
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/qt-cmake-private b/linux-x86_64-nowebengine/libexec/qt-cmake-private
index f69dc2f..365124f 100755
--- a/linux-x86_64-nowebengine/libexec/qt-cmake-private
+++ b/linux-x86_64-nowebengine/libexec/qt-cmake-private
@@ -5,7 +5,7 @@
script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
-original_cmake_path="/buildbot/src/android/emu-prebuilts/prebuilts/cmake/linux-x86/bin/cmake"
+original_cmake_path="/emu-prebuilts/prebuilts/cmake/linux-x86/bin/cmake"
cmake_path=$original_cmake_path
if ! test -f "$cmake_path"; then
cmake_path="cmake"
diff --git a/linux-x86_64-nowebengine/libexec/qvkgen b/linux-x86_64-nowebengine/libexec/qvkgen
index 41ccb7e..e03a77d 100755
--- a/linux-x86_64-nowebengine/libexec/qvkgen
+++ b/linux-x86_64-nowebengine/libexec/qvkgen
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/rcc b/linux-x86_64-nowebengine/libexec/rcc
index 75d4df5..3682147 100755
--- a/linux-x86_64-nowebengine/libexec/rcc
+++ b/linux-x86_64-nowebengine/libexec/rcc
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/syncqt b/linux-x86_64-nowebengine/libexec/syncqt
index 599b287..baf4c6f 100755
--- a/linux-x86_64-nowebengine/libexec/syncqt
+++ b/linux-x86_64-nowebengine/libexec/syncqt
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/tracegen b/linux-x86_64-nowebengine/libexec/tracegen
index 12f3712..c620a2d 100755
--- a/linux-x86_64-nowebengine/libexec/tracegen
+++ b/linux-x86_64-nowebengine/libexec/tracegen
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/tracepointgen b/linux-x86_64-nowebengine/libexec/tracepointgen
index 538807c..c0848f2 100755
--- a/linux-x86_64-nowebengine/libexec/tracepointgen
+++ b/linux-x86_64-nowebengine/libexec/tracepointgen
Binary files differ
diff --git a/linux-x86_64-nowebengine/libexec/uic b/linux-x86_64-nowebengine/libexec/uic
index 2f3d67f..7399074 100755
--- a/linux-x86_64-nowebengine/libexec/uic
+++ b/linux-x86_64-nowebengine/libexec/uic
Binary files differ
diff --git a/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_core_private.pri b/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_core_private.pri
index 6fb3338..c5d1d28 100644
--- a/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_core_private.pri
+++ b/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_core_private.pri
@@ -7,14 +7,13 @@
QT.core_private.depends = core
QT.core_private.uses =
QT.core_private.module_config = v2 internal_module
-QT.core_private.enabled_features = clock-gettime doubleconversion dladdr futimens getauxval getentropy glibc inotify linkat mimetype-database system-pcre2 poll_ppoll renameat2 statx backtrace sha3-fast hijricalendar datetimeparser forkfd_pidfd pcre2 use_lld_linker reduce_exports x86intrin sse2 sse3 ssse3 sse4_1 sse4_2 avx f16c avx2 avx512f avx512er avx512cd avx512pf avx512dq avx512bw avx512vl avx512ifma avx512vbmi avx512vbmi2 aesni vaes rdrnd rdseed shani posix_fallocate alloca_h alloca system-zlib dbus dbus-linked gui network sql testlib widgets xml dlopen relocatable use_lld_linker force_debug_info largefile precompile_header enable_new_dtags sse2 sse3 ssse3 sse4_1 sse4_2 avx f16c avx2 avx512f avx512er avx512cd avx512pf avx512dq avx512bw avx512vl avx512ifma avx512vbmi avx512vbmi2 aesni vaes rdrnd rdseed shani
-QT.core_private.disabled_features = system-doubleconversion glib icu journald system-libb2 poll_pollts poll_poll poll_select qqnx_pps slog2 syslog cpp-winrt lttng etw ctf poll-exit-on-error use_bfd_linker use_gold_linker use_mold_linker android-style-assets gc_binaries developer-build private_tests debug no_direct_extern_access mips_dsp mips_dspr2 neon arm_crc32 arm_crypto alloca_malloc_h stack-protector-strong stdlib-libcpp printsupport libudev openssl intelcet
+QT.core_private.enabled_features = clock-gettime doubleconversion dladdr futimens getauxval getentropy glibc inotify linkat mimetype-database poll_ppoll backtrace sha3-fast hijricalendar datetimeparser forkfd_pidfd pcre2 use_lld_linker reduce_exports x86intrin sse2 sse3 ssse3 sse4_1 sse4_2 avx f16c avx2 avx512f avx512er avx512cd avx512pf avx512dq avx512bw avx512vl avx512ifma avx512vbmi avx512vbmi2 aesni vaes rdrnd rdseed shani posix_fallocate alloca_h alloca system-zlib dbus dbus-linked gui network sql testlib widgets xml dlopen relocatable use_lld_linker force_debug_info largefile precompile_header enable_new_dtags sse2 sse3 ssse3 sse4_1 sse4_2 avx f16c avx2 avx512f avx512er avx512cd avx512pf avx512dq avx512bw avx512vl avx512ifma avx512vbmi avx512vbmi2 aesni vaes rdrnd rdseed shani
+QT.core_private.disabled_features = system-doubleconversion glib icu journald system-libb2 system-pcre2 poll_pollts poll_poll poll_select qqnx_pps renameat2 slog2 statx syslog cpp-winrt lttng etw ctf poll-exit-on-error use_bfd_linker use_gold_linker use_mold_linker android-style-assets gc_binaries developer-build private_tests debug no_direct_extern_access mips_dsp mips_dspr2 neon arm_crc32 arm_crypto alloca_malloc_h stack-protector-strong stdlib-libcpp printsupport libudev openssl intelcet
QMAKE_LIBS_BACKTRACE =
QMAKE_INCDIR_GLIB = /usr/include/glib-2.0 /usr/lib/x86_64-linux-gnu/glib-2.0/include
QMAKE_LIBS_GLIB = -lglib-2.0
QMAKE_LIBS_LIBATOMIC =
QMAKE_LIBS_LIBRT = -lrt
-QMAKE_LIBS_PCRE2 = -lpcre2-16
QMAKE_INCDIR_GOBJECT = /usr/include/glib-2.0 /usr/lib/x86_64-linux-gnu/glib-2.0/include
QMAKE_LIBS_GOBJECT = -lgobject-2.0
QMAKE_INCDIR_GIO = /usr/include/glib-2.0 /usr/lib/x86_64-linux-gnu/glib-2.0/include
diff --git a/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_gui_private.pri b/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_gui_private.pri
index d8eca6e..7f06696 100644
--- a/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_gui_private.pri
+++ b/linux-x86_64-nowebengine/mkspecs/modules/qt_lib_gui_private.pri
@@ -18,7 +18,7 @@
QMAKE_LIBS_LIBJPEG = -ljpeg
QMAKE_LIBS_LIBPNG = -lpng
QMAKE_LIBS_OPENGL = -lGLX -lOpenGL
-QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
QMAKE_LIBS_XLIB = -lX11
QMAKE_LIBS_X11SM = -lICE -lSM
QMAKE_LIBS_XCB = -lxcb
diff --git a/linux-x86_64-nowebengine/plugins/generic/libqevdevkeyboardpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/generic/libqevdevkeyboardpluginAndroidEmu.so
index 897c646..2acc7ca 100644
--- a/linux-x86_64-nowebengine/plugins/generic/libqevdevkeyboardpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/generic/libqevdevkeyboardpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/generic/libqevdevmousepluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/generic/libqevdevmousepluginAndroidEmu.so
index 93a0696..d472330 100644
--- a/linux-x86_64-nowebengine/plugins/generic/libqevdevmousepluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/generic/libqevdevmousepluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/generic/libqevdevtabletpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/generic/libqevdevtabletpluginAndroidEmu.so
index c6a272b..c7e60d3 100644
--- a/linux-x86_64-nowebengine/plugins/generic/libqevdevtabletpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/generic/libqevdevtabletpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/generic/libqevdevtouchpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/generic/libqevdevtouchpluginAndroidEmu.so
index 69e648a..b6e1301 100644
--- a/linux-x86_64-nowebengine/plugins/generic/libqevdevtouchpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/generic/libqevdevtouchpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/generic/libqtuiotouchpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/generic/libqtuiotouchpluginAndroidEmu.so
index 5ed9931..6e09721 100644
--- a/linux-x86_64-nowebengine/plugins/generic/libqtuiotouchpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/generic/libqtuiotouchpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/iconengines/libqsvgiconAndroidEmu.so b/linux-x86_64-nowebengine/plugins/iconengines/libqsvgiconAndroidEmu.so
index 28f4093..2dff2be 100644
--- a/linux-x86_64-nowebengine/plugins/iconengines/libqsvgiconAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/iconengines/libqsvgiconAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqgifAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqgifAndroidEmu.so
index 9161d69..4f25c26 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqgifAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqgifAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqicnsAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqicnsAndroidEmu.so
index eac0770..aa52d34 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqicnsAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqicnsAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqicoAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqicoAndroidEmu.so
index c54bd86..b5fb62f 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqicoAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqicoAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqjpegAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqjpegAndroidEmu.so
index 1bd87a8..6d69687 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqjpegAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqjpegAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqsvgAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqsvgAndroidEmu.so
index fc96782..bdd318d 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqsvgAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqsvgAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqtgaAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqtgaAndroidEmu.so
index fc6c754..79e11c8 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqtgaAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqtgaAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqtiffAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqtiffAndroidEmu.so
index 9a458ce..4107dff 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqtiffAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqtiffAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqwbmpAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqwbmpAndroidEmu.so
index eac4064..a9989d9 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqwbmpAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqwbmpAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/imageformats/libqwebpAndroidEmu.so b/linux-x86_64-nowebengine/plugins/imageformats/libqwebpAndroidEmu.so
index f3ecf86..fac3afd 100644
--- a/linux-x86_64-nowebengine/plugins/imageformats/libqwebpAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/imageformats/libqwebpAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/networkinformation/libqnetworkmanagerAndroidEmu.so b/linux-x86_64-nowebengine/plugins/networkinformation/libqnetworkmanagerAndroidEmu.so
index 3a270d1..dec3635 100644
--- a/linux-x86_64-nowebengine/plugins/networkinformation/libqnetworkmanagerAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/networkinformation/libqnetworkmanagerAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforminputcontexts/libcomposeplatforminputcontextpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforminputcontexts/libcomposeplatforminputcontextpluginAndroidEmu.so
index c9cfa63..42ac64a 100644
--- a/linux-x86_64-nowebengine/plugins/platforminputcontexts/libcomposeplatforminputcontextpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforminputcontexts/libcomposeplatforminputcontextpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforminputcontexts/libibusplatforminputcontextpluginAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforminputcontexts/libibusplatforminputcontextpluginAndroidEmu.so
index f8d4fad..6528eaa 100644
--- a/linux-x86_64-nowebengine/plugins/platforminputcontexts/libibusplatforminputcontextpluginAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforminputcontexts/libibusplatforminputcontextpluginAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforms/libqlinuxfbAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforms/libqlinuxfbAndroidEmu.so
index 3f3595d..3fb76f2 100644
--- a/linux-x86_64-nowebengine/plugins/platforms/libqlinuxfbAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforms/libqlinuxfbAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforms/libqminimalAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforms/libqminimalAndroidEmu.so
index 479d17d..d6756f0 100644
--- a/linux-x86_64-nowebengine/plugins/platforms/libqminimalAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforms/libqminimalAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforms/libqoffscreenAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforms/libqoffscreenAndroidEmu.so
index dbdea47..bcee6b3 100644
--- a/linux-x86_64-nowebengine/plugins/platforms/libqoffscreenAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforms/libqoffscreenAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforms/libqvncAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforms/libqvncAndroidEmu.so
index a3e20c9..33381b2 100644
--- a/linux-x86_64-nowebengine/plugins/platforms/libqvncAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforms/libqvncAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platforms/libqxcbAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platforms/libqxcbAndroidEmu.so
index d20ca27..de06c10 100644
--- a/linux-x86_64-nowebengine/plugins/platforms/libqxcbAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platforms/libqxcbAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/platformthemes/libqxdgdesktopportalAndroidEmu.so b/linux-x86_64-nowebengine/plugins/platformthemes/libqxdgdesktopportalAndroidEmu.so
index e616108..c03875e 100644
--- a/linux-x86_64-nowebengine/plugins/platformthemes/libqxdgdesktopportalAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/platformthemes/libqxdgdesktopportalAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/sqldrivers/libqsqliteAndroidEmu.so b/linux-x86_64-nowebengine/plugins/sqldrivers/libqsqliteAndroidEmu.so
index 038b24a..f99d7f4 100644
--- a/linux-x86_64-nowebengine/plugins/sqldrivers/libqsqliteAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/sqldrivers/libqsqliteAndroidEmu.so
Binary files differ
diff --git a/linux-x86_64-nowebengine/plugins/tls/libqcertonlybackendAndroidEmu.so b/linux-x86_64-nowebengine/plugins/tls/libqcertonlybackendAndroidEmu.so
index 35908c7..408e33a 100644
--- a/linux-x86_64-nowebengine/plugins/tls/libqcertonlybackendAndroidEmu.so
+++ b/linux-x86_64-nowebengine/plugins/tls/libqcertonlybackendAndroidEmu.so
Binary files differ
