From 85143f0236d0868282d1032d91436c3e387ca36e Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Mon, 19 Jan 2015 12:46:21 +0000 Subject: [PATCH] Fix PlotSubWindow and CMakelist to include external code --- app/CMakeLists.txt | 2 +- app/PlotSubWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index ff92526..bb844dd 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -3,7 +3,7 @@ ### # This is hard way - please fix -INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/modules ${CMAKE_BINARY_DIR}/modules ) +INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/modules ${CMAKE_BINARY_DIR}/modules ) set(plaYUver_App_SRCS # Main diff --git a/app/PlotSubWindow.cpp b/app/PlotSubWindow.cpp index b54b66e..b93e969 100644 --- a/app/PlotSubWindow.cpp +++ b/app/PlotSubWindow.cpp @@ -37,7 +37,7 @@ PlotSubWindow::PlotSubWindow( QWidget * parent ) : setVisible( false ); m_cPlotArea = new QCustomPlot( this ); - setWidget( m_cPlotArea ); + setMainWidget( m_cPlotArea ); Example();