Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:16:39 +0000 (18:16 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:16:39 +0000 (18:16 +0100)
commitd6e36401ae68e8e963f1c0d2543f587245e0108b
treea9d237fe3894ef7509ba855c5a1e1affa07f0709
parent735d1fec355b012a1051a45f6a7f6a1ae43f96c5
parent3070815a24239bd0f469bfeb8d0a1f091974e28e
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie55561b4d56f23200eda2cc9d2152ae719f2a906
src/makeqpf/qpf2.cpp
src/makeqpf/qpf2.h