generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QT statusbar bug fixed for Windows

Browse Source
This commit is contained in:
Yannick Verdie 2010-07-27 14:17:43 +00:00
parent 2f2f06b925
commit 21b0652c40
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -506,29 +506,23 @@ endif()
#YV #YV
############################### QT ################################ ############################### QT ################################
set(WITH_QT OFF CACHE BOOL "Build with QT Backend support") set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to QT") set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
set(HAVE_QT 0) #set(HAVE_QT 0)
set(HAVE_QT_OPENGL 0) #set(HAVE_QT_OPENGL 0)
if (WITH_QT) if (WITH_QT)
find_package(Qt4) find_package(Qt4)
if (QT4_FOUND) if (QT4_FOUND)
set(HAVE_QT 1) set(HAVE_QT 1)
find_package (OpenGL QUIET)
#Qt 4.6 is the minimum for OpenGL
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND AND QT_VERSION_MINOR GREATER 5)
set(HAVE_QT_OPENGL 1)
add_definitions(-DHAVE_QT_OPENGL)
endif()
#add_definitions(-DHAVE_QT) #add_definitions(-DHAVE_QT)
set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT") #set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")
find_package (OpenGL QUIET) find_package (OpenGL QUIET)
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND) if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
set(HAVE_QT_OPENGL 1) set(HAVE_QT_OPENGL 1)
add_definitions(-DHAVE_QT_OPENGL) #add_definitions(-DHAVE_QT_OPENGL)
endif() endif()
endif() endif()
endif() endif()

3
modules/highgui/src/window_QT.cpp
View File

@ -2311,6 +2311,9 @@ void ViewPort::paintEvent(QPaintEvent* event)
if (drawInfo) if (drawInfo)
drawInstructions(&myPainter); drawInstructions(&myPainter);
//for statusbar
if (centralWidget->myStatusBar)
drawStatusBar();
QGraphicsView::paintEvent(event); QGraphicsView::paintEvent(event);
} }