mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed OSX compilation (Qt5)

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-07-06 22:03:54 +02:00
parent ec62ed4bcf
commit 067b8ac032
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -34,7 +34,6 @@ CONFIG -= embed_manifest_exe
} }
unix:!macx{ unix:!macx{
QMAKE_CXXFLAGS += -std=c++11
isEqual(QT_MAJOR_VERSION, 5) { isEqual(QT_MAJOR_VERSION, 5) {
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
@ -67,6 +66,10 @@ CONFIG += objective_c
} }
unix{
QMAKE_CXXFLAGS += -std=c++11
}
#CONFIG += release #CONFIG += release
CONFIG -= flat CONFIG -= flat
QT += sql network opengl script QT += sql network opengl script

4
YACReaderLibrary/classic_comics_view.cpp
View File

@ -67,6 +67,10 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
setLayout(layout); setLayout(layout);
layout->setMargin(0); layout->setMargin(0);
#ifdef Q_OS_MAC
sVertical->setCollapsible(1,false);
#endif
} }
void ClassicComicsView::setToolBar(QToolBar *toolBar) void ClassicComicsView::setToolBar(QToolBar *toolBar)

4
YACReaderLibrary/db/data_base_management.cpp
View File

@ -210,7 +210,7 @@ bool DataBaseManagement::createTables(QSqlDatabase & database)
//queryDBInfo.finish(); //queryDBInfo.finish();
QSqlQuery query("INSERT INTO db_info (version) " QSqlQuery query("INSERT INTO db_info (version) "
"VALUES ('"VERSION"')",database); "VALUES ('" VERSION "')",database);
//query.finish(); //query.finish();
} }
@ -245,7 +245,7 @@ void DataBaseManagement::exportComicsInfo(QString source, QString dest)
queryComicsInfo.exec();*/ queryComicsInfo.exec();*/
QSqlQuery query("INSERT INTO dest.db_info (version) " QSqlQuery query("INSERT INTO dest.db_info (version) "
"VALUES ('"VERSION"')",destDB); "VALUES ('" VERSION "')",destDB);
//query.finish(); //query.finish();
QSqlQuery exportData(destDB); QSqlQuery exportData(destDB);

4
YACReaderLibrary/db/tablemodel.cpp
View File

@ -506,7 +506,7 @@ QVector<YACReaderComicReadStatus> TableModel::setComicsRead(QList<QModelIndex> l
db.close(); db.close();
QSqlDatabase::removeDatabase(_databasePath); 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(); return getReadList();
} }
@ -620,7 +620,7 @@ void TableModel::reload(const ComicDB & comic)
row++; row++;
} }
if(found) 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) void TableModel::resetComicRating(const QModelIndex &mi)

1
YACReaderLibrary/library_window.cpp
View File

@ -258,7 +258,6 @@ void LibraryWindow::doLayout()
//collapsible disabled in macosx (only temporaly) //collapsible disabled in macosx (only temporaly)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
sHorizontal->setCollapsible(0,false); sHorizontal->setCollapsible(0,false);
sVertical->setCollapsible(1,false);
#endif #endif
} }