include legacy pre-multiarch plugin paths
authorSteve Langasek <steve.langasek@ubuntu.com>
Mon, 14 Sep 2020 13:56:35 +0000 (14:56 +0100)
committerLisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Mon, 14 Sep 2020 13:56:35 +0000 (14:56 +0100)
commit307b86d01f1586efa955e61997c6738c84a17808
treed4e38963d68c9032b8972873e29cb45909836ffe
parentd8aed6cbf20263f5cca7fd8a6613b5fb95d974f8
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