mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
merge
This commit is contained in:
commit
a27490ab83
@ -49,7 +49,7 @@ else {
|
|||||||
INCLUDEPATH += /usr/local/include/poppler/qt4
|
INCLUDEPATH += /usr/local/include/poppler/qt4
|
||||||
LIBS += -L/usr/local/lib -lpoppler-qt4
|
LIBS += -L/usr/local/lib -lpoppler-qt4
|
||||||
}
|
}
|
||||||
|
QT += macextras
|
||||||
}
|
}
|
||||||
|
|
||||||
#CONFIG += release
|
#CONFIG += release
|
||||||
|
@ -62,6 +62,10 @@
|
|||||||
|
|
||||||
#include "QsLog.h"
|
#include "QsLog.h"
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
//#include <QtMacExtras>
|
||||||
|
#endif
|
||||||
|
|
||||||
LibraryWindow::LibraryWindow()
|
LibraryWindow::LibraryWindow()
|
||||||
:QMainWindow(),fullscreen(false),fetching(false),previousFilter("")
|
:QMainWindow(),fullscreen(false),fetching(false),previousFilter("")
|
||||||
{
|
{
|
||||||
|
@ -123,6 +123,13 @@ void logSystemAndConfig()
|
|||||||
|
|
||||||
int main( int argc, char ** argv )
|
int main( int argc, char ** argv )
|
||||||
{
|
{
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
#if QT_VERSION < 0x050000
|
||||||
|
if(QSysInfo::MacintoshVersion > QSysInfo::MV_10_8)
|
||||||
|
QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
QApplication app( argc, argv );
|
QApplication app( argc, argv );
|
||||||
|
|
||||||
app.setApplicationName("YACReaderLibrary");
|
app.setApplicationName("YACReaderLibrary");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user