Merge remote-tracking branch 'origin/dev_FormTool' into dev

This commit is contained in:
Sonaion
2019-12-12 11:30:26 +01:00
8 changed files with 135 additions and 2 deletions

View File

@@ -8,6 +8,8 @@
#include <QWidget>
#include <QList>
#include "Image/IntelliImage.h"
#include "Image/IntelliRasterImage.h"
#include "Image/IntelliShapedImage.h"
#include "Tool/IntelliTool.h"
@@ -22,6 +24,8 @@ struct LayerObject{
};
class IntelliColorPicker;
class PaintingArea : public QWidget
{
// Declares our class as a QObject which is the base class