Merge branch 'dev' into dev-warnings

src/Layer/PaintingArea.h

@@ -14,6 +14,9 @@
 #include "Tool/IntelliTool.h"
 #include "IntelliHelper/IntelliColorPicker.h"
 
+//for unit testing
+class UnitTest;
+
 /*!
  * \brief The LayerObject struct holds all the information needed to construct a layer
  */
@@ -49,6 +52,10 @@ struct LayerObject {
  */
 class PaintingArea : public QWidget
 {
+friend UnitTest;
+// Declares our class as a QObject which is the base class
+// for all Qt objects
+// QObjects handle events
 Q_OBJECT
 friend IntelliTool;
 friend IntelliPhotoGui;