diff options
author | Marius Kintel <marius@kintel.net> | 2013-04-10 18:28:51 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2013-04-10 18:28:51 (GMT) |
commit | 49a288cd34f604ed13e1eff7b48bcfc6d6286169 (patch) | |
tree | 0ca95d4bfba42e4dc89f1b6f770a34bc6977a4af /tests/csgtexttest.cc | |
parent | fd9dd04f5064a9a21f593670fdcc073fdc14dbfc (diff) | |
parent | d545a227260ddd72b1fdb5c3dc2ebb1bae36c410 (diff) |
Merge branch 'noqt' into testing
Diffstat (limited to 'tests/csgtexttest.cc')
-rw-r--r-- | tests/csgtexttest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index 5bda1f1..3e26814 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -37,7 +37,6 @@ #include "builtin.h" #include "Tree.h" -#include <QCoreApplication> #ifndef _MSC_VER #include <getopt.h> #endif @@ -52,7 +51,6 @@ namespace fs = boost::filesystem; std::string commandline_commands; std::string currentdir; -QString examplesdir; void csgTree(CSGTextCache &cache, const AbstractNode &root) { @@ -75,13 +73,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")); ModuleContext root_ctx; root_ctx.registerBuiltin(); |