Switch to cmake
This commit is contained in:
parent
913d7df56d
commit
c1f6b6e90f
23 changed files with 155 additions and 189 deletions
|
|
@ -132,7 +132,7 @@
|
|||
<customwidget>
|
||||
<class>SensorListWidget</class>
|
||||
<extends>QListView</extends>
|
||||
<header location="local">src/ui/sensorlistwidget.h</header>
|
||||
<header location="local">ui/sensorlistwidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
<customwidget>
|
||||
<class>SensorListWidget</class>
|
||||
<extends>QListView</extends>
|
||||
<header location="local">src/ui/sensorlistwidget.h</header>
|
||||
<header location="local">ui/sensorlistwidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<customwidget>
|
||||
<class>SensorListWidget</class>
|
||||
<extends>QListView</extends>
|
||||
<header location="local">src/ui/sensorlistwidget.h</header>
|
||||
<header location="local">ui/sensorlistwidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
#include "../actors/factoractor.h"
|
||||
#include "../items/messageitem.h"
|
||||
#include "../items/systemitem.h"
|
||||
#include "./itemsettingswidgets/messageitemsettingswidget.h"
|
||||
#include "./itemsettingswidgets/systemitemsettingswidget.h"
|
||||
#include "./itemsettingswidgets/relayitemsettingswidget.h"
|
||||
#include "itemsettingswidgets/messageitemsettingswidget.h"
|
||||
#include "itemsettingswidgets/systemitemsettingswidget.h"
|
||||
#include "itemsettingswidgets/relayitemsettingswidget.h"
|
||||
#include<memory>
|
||||
|
||||
ItemSettingsDialog::ItemSettingsDialog(std::shared_ptr<Item> item, QWidget *parent) :
|
||||
|
|
|
|||
|
|
@ -245,13 +245,13 @@
|
|||
<customwidget>
|
||||
<class>ItemScrollBox</class>
|
||||
<extends>QWidget</extends>
|
||||
<header location="global">../src/ui/itemscrollbox.h</header>
|
||||
<header location="global">../ui/itemscrollbox.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>SensorListWidget</class>
|
||||
<extends>QListView</extends>
|
||||
<header location="global">../src/ui/sensorlistwidget.h</header>
|
||||
<header location="global">../ui/sensorlistwidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#include "itemscrollbox.h"
|
||||
#include "itemsettingsdialog.h"
|
||||
#include "itemcreationdialog.h"
|
||||
#include "src/mainobject.h"
|
||||
#include "src/programmode.h"
|
||||
#include "src/items/poweritem.h"
|
||||
#include "mainobject.h"
|
||||
#include "programmode.h"
|
||||
#include "items/poweritem.h"
|
||||
|
||||
MainWindow::MainWindow(MainObject * const mainObject, QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <QTime>
|
||||
#include <memory>
|
||||
|
||||
#include<src/items/item.h>
|
||||
#include<items/item.h>
|
||||
|
||||
class MainObject;
|
||||
|
||||
|
|
|
|||
|
|
@ -249,12 +249,12 @@
|
|||
<customwidget>
|
||||
<class>SensorListWidget</class>
|
||||
<extends>QListView</extends>
|
||||
<header location="global">src/ui/sensorlistwidget.h</header>
|
||||
<header location="global">ui/sensorlistwidget.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>ItemScrollBox</class>
|
||||
<extends>QWidget</extends>
|
||||
<header location="global">src/ui/itemscrollbox.h</header>
|
||||
<header location="global">ui/itemscrollbox.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
#include <QTableWidget>
|
||||
#include <vector>
|
||||
#include "src/sensors/sensor.h"
|
||||
#include "sensors/sensor.h"
|
||||
|
||||
class SensorListItem : public QTableWidgetItem
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue