From 25bca99d7025e6ddcda4ec2ed0fa7e582d068e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 29 Jan 2014 13:56:02 -0800
Subject: [PATCH] fixed Qt5 compilation for YACReaderLibrary in Linux fixed
 management of special chars in CompressedArchive paths (only with Qt5, TODO:
 fix the issue in Qt4)

---
 YACReader/YACReader.pri                   | 1 +
 YACReaderLibrary/YACReaderLibrary.pro     | 9 ++++++++-
 YACReaderLibrary/library_window.cpp       | 2 +-
 compressed_archive/compressed_archive.cpp | 9 ++++++++-
 compressed_archive/wrapper.pri            | 2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri
index 7eddf35b..ff28a0d9 100644
--- a/YACReader/YACReader.pri
+++ b/YACReader/YACReader.pri
@@ -30,6 +30,7 @@ LIBS         += -L/usr/lib -lpoppler-qt5
 else {
 INCLUDEPATH  += /usr/include/poppler/qt4
 LIBS         += -L/usr/lib -lpoppler-qt4
+
 }
 LIBS	     += -lGLU
 }
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 50bbb8e2..358fc58a 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -34,8 +34,15 @@ CONFIG -= embed_manifest_exe
 }
 
 unix:!macx{
+
+isEqual(QT_MAJOR_VERSION, 5) {
+INCLUDEPATH  += /usr/include/poppler/qt5
+LIBS         += -L/usr/lib -lpoppler-qt5
+}
+else {
 INCLUDEPATH  += /usr/include/poppler/qt4
 LIBS         += -L/usr/lib -lpoppler-qt4
+}
 LIBS	     += -lGLU
 }
 
@@ -97,7 +104,7 @@ HEADERS += comic_flow.h \
     comics_remover.h \
 	../common/http_worker.h \
     yacreader_libraries.h \
-	../common/exit_check.cpp \
+        ../common/exit_check.h \
 		   
 SOURCES += comic_flow.cpp \
            create_library_dialog.cpp \
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 33e49110..38c13fcd 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -945,7 +945,7 @@ void LibraryWindow::loadCovers(const QModelIndex & mi)
 	
 	comicView->setModel(dmCV);
 	comicView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-#if QT_VERSION >= 0x050100
+#if QT_VERSION >= 0x050000
 	comicView->horizontalHeader()->setSectionsMovable(true);
 #else
 	comicView->horizontalHeader()->setMovable(true);
diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp
index aad9edee..0ec119c0 100644
--- a/compressed_archive/compressed_archive.cpp
+++ b/compressed_archive/compressed_archive.cpp
@@ -107,8 +107,11 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
                 qDebug() << "wrong format";
 				continue;
             }
-
+#ifdef UNICODE
             if (!fileSpec->Open((LPCTSTR)filePath.toStdWString().data()))
+#else
+            if (!fileSpec->Open((LPCTSTR)filePath.toStdString().data()))
+#endif
             {
                 qDebug() << "unable to load" + filePath;
 				continue;
@@ -147,7 +150,11 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
                 return;
             }
 
+#ifdef UNICODE
             if (!fileSpec->Open((LPCTSTR)filePath.toStdWString().data()))
+#else
+            if (!fileSpec->Open((LPCTSTR)filePath.toStdString().data()))
+#endif
             {
                 qDebug() << "Error opening rar file :" + filePath;
                 return;
diff --git a/compressed_archive/wrapper.pri b/compressed_archive/wrapper.pri
index 97ba4b8d..933a27e7 100644
--- a/compressed_archive/wrapper.pri
+++ b/compressed_archive/wrapper.pri
@@ -54,7 +54,7 @@ DEFINES += UNICODE _UNICODE _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \
 }
 
 unix:!macx{
-DEFINES += UNICODE _UNICODE _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \
+DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE \
 	NDEBUG _REENTRANT ENV_UNIX \
 	_7ZIP_LARGE_PAGES
 	}