Can you add ``#undef loop /* Todo: ugh, remove this when the #define loop is gone from util.h */`` before all ``#include <QApplication>`` you moved or it will break Qt5 compilation on some machines.