comparison main/main.cpp @ 913:3c88bf74959d cxx11

Merge from default branch
author Chris Cannam
date Tue, 03 Mar 2015 09:33:59 +0000
parents 62198dde171e
children 45bb2eaf7fe1 691a8210e480
comparison
equal deleted inserted replaced
903:6d3220e7ecef 913:3c88bf74959d
18 #include "system/System.h" 18 #include "system/System.h"
19 #include "system/Init.h" 19 #include "system/Init.h"
20 #include "base/TempDirectory.h" 20 #include "base/TempDirectory.h"
21 #include "base/PropertyContainer.h" 21 #include "base/PropertyContainer.h"
22 #include "base/Preferences.h" 22 #include "base/Preferences.h"
23 #include "data/fileio/FileSource.h"
23 #include "widgets/TipDialog.h" 24 #include "widgets/TipDialog.h"
24 #include "widgets/InteractiveFileFinder.h" 25 #include "widgets/InteractiveFileFinder.h"
25 #include "svapp/framework/TransformUserConfigurator.h" 26 #include "svapp/framework/TransformUserConfigurator.h"
26 #include "transform/TransformFactory.h" 27 #include "transform/TransformFactory.h"
27 28
455 } 456 }
456 #endif 457 #endif
457 settings.endGroup(); 458 settings.endGroup();
458 #endif 459 #endif
459 460
461 FileSource::debugReport();
462
460 delete gui; 463 delete gui;
461 464
462 cleanupMutex.unlock(); 465 cleanupMutex.unlock();
463 466
464 return rv; 467 return rv;