utility: headless parsing

* resolve merge conflict
   * rpath for dev
   * generate a coatidb with a coatiproject
   * build script change to cmake --build
This commit is contained in:
Andreas Stallinger
2016-02-23 18:59:17 +01:00
parent 5b7e958ea7
commit 76697d8b6e
9 changed files with 184 additions and 85 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
#include "qt/window/QtSplashScreen.h"
#include <QApplication>
#include <QCoreApplication>
#include <QThread>
#include <QTimer>
@@ -38,7 +38,7 @@ QtSplashScreen::~QtSplashScreen()
{
}
void QtSplashScreen::exec(QApplication& app)
void QtSplashScreen::exec(QCoreApplication& app)
{
m_state = 0;
QTimer* timer = new QTimer(this);