SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

revert QGLVIEW flag

Browse Source
This commit is contained in:
Бычков Андрей
2021-04-23 10:12:37 +03:00
parent c246ed9b50
commit 4880d3604f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/graphic/graphic.cpp
View File

@@ -1628,8 +1628,9 @@ void Graphic::on_graphic_buttonConfigure_clicked() {
conf->ui->colorGrid->setColor(grid_pen.color()); conf->ui->colorGrid->setColor(grid_pen.color());
conf->ui->comboStyleGrid->setCurrentIndex((int)grid_pen.style()); conf->ui->comboStyleGrid->setCurrentIndex((int)grid_pen.style());
conf->ui->spinWidthGrid->setValue(grid_pen.widthF()); conf->ui->spinWidthGrid->setValue(grid_pen.widthF());
#ifdef HAS_GL
conf->ui->checkOGL->setChecked(isOGL); conf->ui->checkOGL->setChecked(isOGL);
#ifndef HAS_GL #else
conf->ui->checkOGL->setEnabled(false); conf->ui->checkOGL->setEnabled(false);
conf->ui->checkOGL->setChecked(false); conf->ui->checkOGL->setChecked(false);
#endif #endif

2
libs/qglview/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
if (((DEFINED QGLVIEW) AND QGLVIEW AND HAS_GL) OR (NOT DEFINED QGLVIEW)) if (((DEFINED QGLVIEW) AND QGLVIEW) OR (NOT DEFINED QGLVIEW))
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
shstk_qad_project(qglview FALSE "qad" "Gui;OpenGL;Xml" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}") shstk_qad_project(qglview FALSE "qad" "Gui;OpenGL;Xml" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
shstk_qad_install("qad" FALSE qglview "${out_HDR}" "${out_QM}") shstk_qad_install("qad" FALSE qglview "${out_HDR}" "${out_QM}")