add no_opengl config option to YACReaderLibrary

This commit is contained in:
Felix Kauselmann
2015-02-17 17:45:48 +01:00
parent 4db439511b
commit 20d278c301
3 changed files with 27 additions and 9 deletions

View File

@ -6,7 +6,6 @@ HEADERS += $$PWD/help_about_dialog.h \
$$PWD/yacreader_field_plain_text_edit.h \
$$PWD/yacreader_flow.h \
$$PWD/yacreader_flow_config_widget.h \
#$$PWD/yacreader_gl_flow_config_widget.h \
$$PWD/yacreader_options_dialog.h \
$$PWD/yacreader_search_line_edit.h \
$$PWD/yacreader_spin_slider_widget.h \
@ -19,6 +18,9 @@ HEADERS += $$PWD/help_about_dialog.h \
$$PWD/yacreader_library_item_widget.h \
$$PWD/yacreader_treeview.h \
$$PWD/yacreader_busy_widget.h
!CONFIG(no_opengl){
HEADERS += $$PWD/yacreader_gl_flow_config_widget.h
}
macx{
HEADERS += $$PWD/yacreader_macosx_toolbar.h
@ -29,7 +31,6 @@ SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_field_plain_text_edit.cpp \
$$PWD/yacreader_flow.cpp \
$$PWD/yacreader_flow_config_widget.cpp \
#$$PWD/yacreader_gl_flow_config_widget.cpp \
$$PWD/yacreader_options_dialog.cpp \
$$PWD/yacreader_search_line_edit.cpp \
$$PWD/yacreader_spin_slider_widget.cpp \
@ -43,6 +44,10 @@ SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_treeview.cpp \
$$PWD/yacreader_busy_widget.cpp
!CONFIG(no_opengl){
SOURCES += $$PWD/yacreader_gl_flow_config_widget.cpp
}
macx{
OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm
}

View File

@ -102,8 +102,10 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
connect(gl->performanceSlider, SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
connect(gl->vSyncCheck,SIGNAL(stateChanged(int)),this,SLOT(saveUseVSync(int)));
#endif
}
#ifndef NO_OPENGL
void YACReaderOptionsDialog::savePerformance(int value)
{
settings->setValue(PERFORMANCE,value);
@ -128,8 +130,6 @@ void YACReaderOptionsDialog::saveFlowParameters()
settings->setValue(LIGHT_STRENGTH,gl->lightStrength->getValue());
settings->setValue(MAX_ANGLE,gl->maxAngle->getValue());
}
#else
}
#endif
void YACReaderOptionsDialog::saveOptions()