projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update #include directives to work with Qt5 as well as Qt4
[pulseview.git]
/
pv
/
widgets
/
wellarray.cpp
diff --git
a/pv/widgets/wellarray.cpp
b/pv/widgets/wellarray.cpp
index a5979db7183d79696a659483157beb1a84076705..dcc3b417e146474a3b26cfea0f07d60ade86ccb6 100644
(file)
--- a/
pv/widgets/wellarray.cpp
+++ b/
pv/widgets/wellarray.cpp
@@
-39,8
+39,6
@@
**
****************************************************************************/
**
****************************************************************************/
-#define QT_NO_MENU
-
#include <QPainter>
#include <QPaintEvent>
#include <QStyle>
#include <QPainter>
#include <QPaintEvent>
#include <QStyle>
@@
-220,11
+218,6
@@
void QWellArray::setSelected(int row, int col)
updateCell(selRow, selCol);
if (row >= 0)
emit selected(row, col);
updateCell(selRow, selCol);
if (row >= 0)
emit selected(row, col);
-
-#ifndef QT_NO_MENU
- if (isVisible() && qobject_cast<QMenu*>(parentWidget()))
- parentWidget()->close();
-#endif
}
void QWellArray::focusInEvent(QFocusEvent*)
}
void QWellArray::focusInEvent(QFocusEvent*)