fix merge

This commit is contained in:
Brad Hefta-Gaub 2016-01-12 10:36:59 -08:00
parent 6ac9b737d2
commit 5b9607ca29

View file

@ -448,8 +448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
_bookmarks = new Bookmarks(); // Before setting up the menu
_runningScriptsWidget = new RunningScriptsWidget(_window);
// start the nodeThread so its event loop is running
QThread* nodeThread = new QThread(this);
nodeThread->setObjectName("NodeList Thread");