Merge remote-tracking branch 'upstream/master' into feature-cpack

This commit is contained in:
Fabio Bas 2014-06-22 20:01:24 +02:00
commit 77d41160b8
9 changed files with 136 additions and 28 deletions

View file

@ -108,9 +108,9 @@ int main(int argc, char *argv[])
qtTranslator = new QTranslator;
translator = new QTranslator;
installNewTranslator();
qsrand(QDateTime::currentDateTime().toTime_t());
bool startMainProgram = true;
const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
if (!db->getLoadSuccess())