Merge #21376: depends: Qt 5.12.10
550ed1bed2build: update qt qpaint non determinism patch for 5.12.10 (fanquake)6093ae4d30build: update qt no-xlib patch for 5.12.10 (fanquake)84928c4e73build: update qt android jni static patch for 5.12.10 (fanquake)cc6f47d51abuild: update qt lrelease patch for 5.12.10 (fanquake)286d07ff17build, qt: Fix lib paths in *.pc files (Hennadii Stepanov)fa5e97e8c2build: disable qt SDK version checking (fanquake)1be8e0f238build: Add QMacStyle support (Hennadii Stepanov)e674e94302build: revert to using Qts internal zlib (fanquake)06cd0da21fbuild: qt 5.12.10 (fanquake)3272e34f9cbuild: Add xkbcommon 0.8.4 (Hennadii Stepanov)d769b3372dbuild: only pass -optimized-tools to qt in debug mode (fanquake) Pull request description: Switch to Qt 5.12.10 in depends. Based on #21363. This is a much smaller changeset, and should be easier to review than #19716. Also postpones needing to bring a bunch of new libs into depends. Big thanks to Hebasto that has been helping with this. ACKs for top commit: laanwj: Code review ACK550ed1bed2hebasto: ACK550ed1bed2jarolrod: ACK550ed1bed2, tested on macOS 11.2 built from depends Tree-SHA512: cb6b70f5a5372ba0b64f7ddfa696eda0411922cd261c67bfa2d9332c685a7b358ab18e5cfaa677b414ae8ad78296bba6ed0eecd071fdacdf736a0d030f679fe5
This commit is contained in:
29 files changed
+326
-289
No files matched your search
@@ -62,6 +62,7 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
|
||||
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
|
||||
#elif defined(QT_QPA_PLATFORM_COCOA)
|
||||
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin);
|
||||
Q_IMPORT_PLUGIN(QMacStylePlugin);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user