projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: Bundle Qt libs with the APK
[pulseview.git]
/
pv
/
widgets
/
colourbutton.h
diff --git
a/pv/widgets/colourbutton.h
b/pv/widgets/colourbutton.h
index 22f6bdbc90897301e79d42814d9cc1c3d0b84e6d..2e62e43c1a577f55ec422624765489bb37b62947 100644
(file)
--- a/
pv/widgets/colourbutton.h
+++ b/
pv/widgets/colourbutton.h
@@
-21,6
+21,8
@@
#ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
#ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
+#include <QPushButton>
+
#include "colourpopup.h"
namespace pv {
#include "colourpopup.h"
namespace pv {
@@
-47,12
+49,12
@@
public:
private:
void paintEvent(QPaintEvent *e);
private:
void paintEvent(QPaintEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_clicked(bool);
void on_selected(int row, int col);
void on_clicked(bool);
void on_selected(int row, int col);
-
signals
:
+
Q_SIGNALS
:
void selected(const QColor &colour);
private:
void selected(const QColor &colour);
private: