Fixed vtable issues and enabled automoc in CMakeLists.txt
This commit is contained in:
parent
b137a11c4b
commit
7b6e49f770
|
@ -11,8 +11,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
# Find Qt6
|
# Find Qt6
|
||||||
find_package(Qt6 REQUIRED COMPONENTS Widgets)
|
find_package(Qt6 REQUIRED COMPONENTS Widgets)
|
||||||
|
|
||||||
# Add the libeismultiplexer library
|
# Enable automoc for Qt meta-object compiler
|
||||||
add_subdirectory(../libeismultiplexer)
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
|
||||||
|
# Include the libeismultiplexer library
|
||||||
|
include_directories(/workspace/libeismultiplexer)
|
||||||
|
link_directories(/workspace/libeismultiplexer/build)
|
||||||
|
|
||||||
# Add the application executable
|
# Add the application executable
|
||||||
add_executable(eismultiplexer-qt
|
add_executable(eismultiplexer-qt
|
||||||
|
|
|
@ -15,9 +15,9 @@ class ChannelWidget : public QWidget
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber, struct eismultiplexer* multiplexer,
|
explicit ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber, struct eismultiplexer* multiplexer,
|
||||||
QWidget *parent = nullptr);
|
QWidget *parent = nullptr);
|
||||||
~ChannelWidget();
|
~ChannelWidget() override;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onChannelToggled(bool checked);
|
void onChannelToggled(bool checked);
|
||||||
|
|
|
@ -19,8 +19,8 @@ class MainWindow : public QMainWindow
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MainWindow(QWidget *parent = nullptr);
|
explicit MainWindow(QWidget *parent = nullptr);
|
||||||
~MainWindow();
|
~MainWindow() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void enumerateDevices();
|
void enumerateDevices();
|
||||||
|
|
Loading…
Reference in a new issue