summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/main.cpp
diff options
context:
space:
mode:
authorFranklin Wei <franklin@rockbox.org>2019-11-09 20:52:08 -0500
committerFranklin Wei <franklin@rockbox.org>2019-11-09 20:54:57 -0500
commita5f228eee2240c3d12f0d03b51adad5603cb10d3 (patch)
treeb1f514917f817ef973dc1aa935ff7b5979f2099b /rbutil/rbutilqt/main.cpp
parent1925d043a2d98caacc669ded319a7e1fcd197ef8 (diff)
downloadrockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.tar.gz
rockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.tar.bz2
rockbox-a5f228eee2240c3d12f0d03b51adad5603cb10d3.zip
rbutil: fix windows cross compile (via M cross environment)
This fixes a couple of issues when cross-compiling for windows: - lib builds (i.e. mks5lboot) were overriding the cross CC/CXX with the native CC, producing incompatible binaries. - Qt made the accessibility plugin part of the core library, so we no longer need to import it. Change-Id: I9d884aee62dfa51d3624a3fa9b99c23b3b375f20
Diffstat (limited to 'rbutil/rbutilqt/main.cpp')
-rw-r--r--rbutil/rbutilqt/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp
index f950d20403..93fb0f4b31 100644
--- a/rbutil/rbutilqt/main.cpp
+++ b/rbutil/rbutilqt/main.cpp
@@ -29,7 +29,11 @@
#include <QtPlugin>
#if QT_VERSION < 0x050000
Q_IMPORT_PLUGIN(qtaccessiblewidgets)
-#else
+#elif QT_VERSION < 0x050400
+/*
+ * accessibility is no longer a plugin after 5.4.0:
+ * <https://bugreports.qt.io/browse/QTBUG-37957?focusedCommentId=239189&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-239189>
+ */
Q_IMPORT_PLUGIN(AccessibleFactory)
#endif
#endif