include legacy pre-multiarch plugin paths
authorSteve Langasek <steve.langasek@ubuntu.com>
Sun, 20 Sep 2020 19:01:50 +0000 (20:01 +0100)
committerAdrian Bunk <bunk@debian.org>
Sun, 20 Sep 2020 19:01:50 +0000 (20:01 +0100)
commit1e3c4fcda350ca787992aff91812584289f7cdf9
tree3a54587dc87500b99a21c43cca533dcb347f8de9
parente4efbdac621057ab1075fff62a897ceb0f5af146
include legacy pre-multiarch plugin paths

Last-Update: 2012-04-25

A full multiarch system requires an architecture-qualified plugin path for
Qt, but installed systems may still have plugins (e.g., from other
distribution packages) in another pre-multiarch directory.  When constructing
the plugin path, include both the configured plugin path and a plugin path
with the architecture triplet stripped out.

This applies to the general plugin loading system, and to the QML one.

Gbp-Pq: Name qt-multiarch-plugin-path-compat.diff
src/corelib/kernel/qcoreapplication.cpp
src/declarative/qml/qdeclarativeimport.cpp