From 067b8ac0324af98d5b955b76c09f9f8b45760bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Sun, 6 Jul 2014 22:03:54 +0200
Subject: [PATCH] fixed OSX compilation (Qt5)

---
 YACReaderLibrary/YACReaderLibrary.pro        | 5 ++++-
 YACReaderLibrary/classic_comics_view.cpp     | 4 ++++
 YACReaderLibrary/db/data_base_management.cpp | 4 ++--
 YACReaderLibrary/db/tablemodel.cpp           | 4 ++--
 YACReaderLibrary/library_window.cpp          | 1 -
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index ccf4566e..b34a5fc0 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -34,7 +34,6 @@ CONFIG -= embed_manifest_exe
 }
 
 unix:!macx{
-QMAKE_CXXFLAGS += -std=c++11
 
 isEqual(QT_MAJOR_VERSION, 5) {
 INCLUDEPATH  += /usr/include/poppler/qt5
@@ -67,6 +66,10 @@ CONFIG += objective_c
 
 }
 
+unix{
+QMAKE_CXXFLAGS += -std=c++11
+}
+
 #CONFIG += release
 CONFIG -= flat
 QT += sql network opengl script
diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
index 26ee326f..e64106e9 100644
--- a/YACReaderLibrary/classic_comics_view.cpp
+++ b/YACReaderLibrary/classic_comics_view.cpp
@@ -67,6 +67,10 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
     setLayout(layout);
 
     layout->setMargin(0);
+
+#ifdef Q_OS_MAC
+    sVertical->setCollapsible(1,false);
+#endif
 }
 
 void ClassicComicsView::setToolBar(QToolBar *toolBar)
diff --git a/YACReaderLibrary/db/data_base_management.cpp b/YACReaderLibrary/db/data_base_management.cpp
index 244634db..1b0ce7c9 100644
--- a/YACReaderLibrary/db/data_base_management.cpp
+++ b/YACReaderLibrary/db/data_base_management.cpp
@@ -210,7 +210,7 @@ bool DataBaseManagement::createTables(QSqlDatabase & database)
 	//queryDBInfo.finish();
 
 	QSqlQuery query("INSERT INTO db_info (version) "
-				   "VALUES ('"VERSION"')",database);
+                   "VALUES ('" VERSION "')",database);
 	//query.finish();
 	}
 
@@ -245,7 +245,7 @@ void DataBaseManagement::exportComicsInfo(QString source, QString dest)
 	queryComicsInfo.exec();*/
 
 	QSqlQuery query("INSERT INTO dest.db_info (version) "
-		"VALUES ('"VERSION"')",destDB);
+        "VALUES ('" VERSION "')",destDB);
 	//query.finish();
 
 	QSqlQuery exportData(destDB);
diff --git a/YACReaderLibrary/db/tablemodel.cpp b/YACReaderLibrary/db/tablemodel.cpp
index 08f996cc..1d9e51c2 100644
--- a/YACReaderLibrary/db/tablemodel.cpp
+++ b/YACReaderLibrary/db/tablemodel.cpp
@@ -506,7 +506,7 @@ QVector<YACReaderComicReadStatus> TableModel::setComicsRead(QList<QModelIndex> l
 	db.close();
 	QSqlDatabase::removeDatabase(_databasePath);
 
-    emit dataChanged(index(list.first().row(),TableModel::ReadColumn),index(list.last().row(),TableModel::HasBeenOpened),QVector<int>() = {ReadColumnRole,CurrentPageRole,HasBeenOpenedRole});
+    emit dataChanged(index(list.first().row(),TableModel::ReadColumn),index(list.last().row(),TableModel::HasBeenOpened),QVector<int>() << ReadColumnRole << CurrentPageRole << HasBeenOpenedRole);
 
 	return getReadList();
 }
@@ -620,7 +620,7 @@ void TableModel::reload(const ComicDB & comic)
 		row++;
 	}
     if(found)
-        emit dataChanged(index(row,ReadColumn),index(row,HasBeenOpened), QVector<int>() = {ReadColumnRole,CurrentPageRole,HasBeenOpenedRole});
+        emit dataChanged(index(row,ReadColumn),index(row,HasBeenOpened), QVector<int>() << ReadColumnRole << CurrentPageRole << HasBeenOpenedRole);
 }
 
 void TableModel::resetComicRating(const QModelIndex &mi)
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index c01d75a9..81fc2af4 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -258,7 +258,6 @@ void LibraryWindow::doLayout()
 	//collapsible disabled in macosx (only temporaly)
 #ifdef Q_OS_MAC
 	sHorizontal->setCollapsible(0,false);
-	sVertical->setCollapsible(1,false);
 #endif
 }