This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
#include <QApplication>
#include "mainform.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MyWindow *mainWin = new MyWindow;
mainWin->show();
return app.exec();
}