Merge branch 'unstable' into trackhattrackhat-1.2p1

1 files changed, 27 insertions, 0 deletions

diff --git a/tracker-rs/imagewidget.h b/tracker-rs/imagewidget.h
new file mode 100644
index 00000000..e8b6e61e
--- /dev/null
+++ b/tracker-rs/imagewidget.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015, Intel Corporation
+ *   Author: Xavier Hallade <xavier.hallade@intel.com>
+ * Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+ 
+#pragma once
+
+#include <QWidget>
+#include <QImage>
+#include <QMutex>
+
+class ImageWidget : public QWidget {
+  Q_OBJECT
+public:
+  ImageWidget(QWidget* parent = 0);
+  void setImage(const QImage image);
+
+private:
+  QImage mImage;
+  QMutex mMutex;
+
+protected:
+  void paintEvent(QPaintEvent* event);
+
+};