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)
Change-Id: Ie55561b4d56f23200eda2cc9d2152ae719f2a906

1  2 
src/makeqpf/qpf2.cpp
src/makeqpf/qpf2.h

Simple merge
Simple merge