From 2f5b5369ba0a735e44ca425d5a22f911f73e6a35 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 5 Jul 2018 10:33:11 +0200 Subject: [PATCH] Disable warning from qt5 and --- CMakeLists.txt | 2 +- gui/fpgaviewwidget.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ef6ada..b4493486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 11) if (MSVC) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121 /wd4996") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121 /wd4996") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W4 /wd4100 /wd4244 /wd4125 /wd4800 /wd4456 /wd4458 /wd4305 /wd4459 /wd4121 /wd4996 /wd4127") else() set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g") diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc index 12d52c77..bf26d0b5 100644 --- a/gui/fpgaviewwidget.cc +++ b/gui/fpgaviewwidget.cc @@ -360,8 +360,8 @@ void FPGAViewWidget::paintGL() for (auto &el : ctx_->getBelGraphics(bel)) drawElement(bels, el); } + lineShader_.draw(bels, matrix); } - lineShader_.draw(bels, matrix); // Draw Frame Graphics. auto frames = LineShaderData(0.02f, QColor("#0066ba")); @@ -369,8 +369,8 @@ void FPGAViewWidget::paintGL() for (auto &el : ctx_->getFrameGraphics()) { drawElement(frames, el); } + lineShader_.draw(frames, matrix); } - lineShader_.draw(frames, matrix); } void FPGAViewWidget::resizeGL(int width, int height) {}