From 7f04e688f436bedcc62701b27a40406b6a9f8441 Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Sun, 22 Mar 2015 16:33:38 +0100
Subject: [PATCH] fix merge

---
 compressed_archive/compressed_archive.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp
index 44bdccfb..9ffb1ee2 100644
--- a/compressed_archive/compressed_archive.cpp
+++ b/compressed_archive/compressed_archive.cpp
@@ -199,7 +199,7 @@ bool CompressedArchive::loadFunctions()
     {
 #if defined Q_OS_UNIX
 	#if defined Q_OS_MAC
-		rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29");
+		rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29");
 	#else
 		//check if a yacreader specific version of p7zip exists on the system
 		QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");