summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2014-01-05 00:14:10 +0000
committerSky <git@bunnies.cc>2014-01-05 00:14:10 +0000
commit7d5fb1e99be24a884a69f3cf521aee8e310e2a6e (patch)
tree51d25c7f760eef471de31bf5b1a1e563e87def3c /tests
parent79158144df1b606982bfa722447416c9549de860 (diff)
parente558584af0e6a168d76868e89d132aeebd0aa36a (diff)
downloadMultiMC-7d5fb1e99be24a884a69f3cf521aee8e310e2a6e.tar
MultiMC-7d5fb1e99be24a884a69f3cf521aee8e310e2a6e.tar.gz
MultiMC-7d5fb1e99be24a884a69f3cf521aee8e310e2a6e.tar.lz
MultiMC-7d5fb1e99be24a884a69f3cf521aee8e310e2a6e.tar.xz
MultiMC-7d5fb1e99be24a884a69f3cf521aee8e310e2a6e.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'tests')
-rw-r--r--tests/TestUtil.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/TestUtil.h b/tests/TestUtil.h
index fd25d24f..231ce7f6 100644
--- a/tests/TestUtil.h
+++ b/tests/TestUtil.h
@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) \
{ \
char *argv_[] = { argv[0] _MMC_EXTRA_ARGV }; \
int argc_ = 1 + _MMC_EXTRA_ARGC; \
- MultiMC app(argc_, argv_, QDir::temp().absoluteFilePath("MultiMC_Test")); \
+ MultiMC app(argc_, argv_/*, QDir::temp().absoluteFilePath("MultiMC_Test")*/); \
app.setAttribute(Qt::AA_Use96Dpi, true); \
TestObject tc; \
return QTest::qExec(&tc, argc, argv); \