Merge branch 'noqt' of ssh://ssh.github.com:443/openscad/openscad into noqt_tweaks

1 files changed, 3 insertions, 6 deletions

diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc
index 3a0a855..b7e51b5 100644
--- a/tests/cgalcachetest.cc
+++ b/tests/cgalcachetest.cc
@@ -40,7 +40,6 @@
 #include "PolySetCGALEvaluator.h"
 #include "CGALCache.h"
 
-#include <QCoreApplication>
 #ifndef _MSC_VER
 #include <getopt.h>
 #endif
@@ -57,7 +56,6 @@ namespace po = boost::program_options;
 
 std::string commandline_commands;
 std::string currentdir;
-QString examplesdir;
 
 using std::string;
 
@@ -124,13 +122,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() );
+	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);