Included some testsuite into qtmain and updated travis file to try to use it.

2013-10-27 23:06:29 +01:00
parent 7a7bc70773
commit 224c94e890
25 changed files with 185 additions and 76 deletions
@@ -117,7 +117,7 @@ void GameStateOptions::Start()
    optionsList->failMsg = "";
    optionsTabs->Add(optionsList);

-    optionsMenu = NEW SimpleMenu(JGE::GetInstance(), -102, this, Fonts::MAIN_FONT, 50, 170);
+    optionsMenu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), -102, this, Fonts::MAIN_FONT, 50, 170);
    optionsMenu->Add(kBackToMainMenuID, "Back to Main Menu");
    optionsMenu->Add(kSaveAndBackToMainMenuID, "Save And Exit");
    optionsMenu->Add(kCancelMenuID, "Cancel");