Merge branch 'master' into issue217

1 files changed, 2 insertions, 5 deletions

diff --git a/tests/echotest.cc b/tests/echotest.cc
index bf2f4a4..af4942b 100644
--- a/tests/echotest.cc
+++ b/tests/echotest.cc
@@ -34,7 +34,6 @@
 #include "builtin.h"
 #include "printutils.h"
 
-#include <QCoreApplication>
 #ifndef _MSC_VER
 #include <getopt.h>
 #endif
@@ -49,7 +48,6 @@ namespace fs = boost::filesystem;
 
 std::string commandline_commands;
 std::string currentdir;
-QString examplesdir;
 
 using std::string;
 
@@ -83,13 +81,12 @@ int main(int argc, char **argv)
 
 	Builtins::instance()->initialize();
 
-	QCoreApplication app(argc, argv);
 	fs::path original_path = fs::current_path();
 
 	currentdir = boosty::stringy( fs::current_path() );
 
-	parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
-	add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries"));
+	parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
+	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
 
 	Context root_ctx;
 	register_builtin(root_ctx);