From cca740afeaa3c4d79035546bf77935efe38830b1 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 19 Jan 2018 14:33:08 +0100
Subject: tracker/pt: fix broken resources

Spotted by: @cpuwolf
Issue: #718
---
 tracker-pt/FTNoIR_PT_Controls.ui        | 2 +-
 tracker-pt/ftnoir_tracker_pt.qrc        | 8 --------
 tracker-pt/ftnoir_tracker_pt_dialog.cpp | 4 ++++
 tracker-pt/module/ftnoir_tracker_pt.qrc | 5 -----
 tracker-pt/module/tracker_pt.qrc        | 5 +++++
 tracker-pt/tracker_pt_base.qrc          | 8 ++++++++
 6 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 tracker-pt/ftnoir_tracker_pt.qrc
 delete mode 100644 tracker-pt/module/ftnoir_tracker_pt.qrc
 create mode 100644 tracker-pt/module/tracker_pt.qrc
 create mode 100644 tracker-pt/tracker_pt_base.qrc

(limited to 'tracker-pt')

diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui
index d53cbf7e..61211b6d 100644
--- a/tracker-pt/FTNoIR_PT_Controls.ui
+++ b/tracker-pt/FTNoIR_PT_Controls.ui
@@ -23,7 +23,7 @@
    <string>PointTracker Settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="ftnoir_tracker_pt.qrc">
+   <iconset resource="tracker_pt_base.qrc">
     <normaloff>:/Resources/Logo_IR.png</normaloff>:/Resources/Logo_IR.png</iconset>
   </property>
   <property name="layoutDirection">
diff --git a/tracker-pt/ftnoir_tracker_pt.qrc b/tracker-pt/ftnoir_tracker_pt.qrc
deleted file mode 100644
index 8c270540..00000000
--- a/tracker-pt/ftnoir_tracker_pt.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Resources/cap_front.png</file>
-        <file>Resources/cap_side.png</file>
-        <file>Resources/clip_front.png</file>
-        <file>Resources/clip_side.png</file>
-    </qresource>
-</RCC>
diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
index 5d376468..a8b545ca 100644
--- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp
+++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
@@ -11,7 +11,9 @@
 #include "compat/math.hpp"
 #include "compat/camera-names.hpp"
 #include <opencv2/core.hpp>
+
 #include <QString>
+#include <QtGlobal>
 #include <QDebug>
 
 using namespace options;
@@ -22,6 +24,8 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) :
     timer(this),
     trans_calib(1, 2, 0)
 {
+    Q_INIT_RESOURCE(tracker_pt_base);
+
     ui.setupUi(this);
 
     ui.camdevice_combo->addItems(get_camera_names());
diff --git a/tracker-pt/module/ftnoir_tracker_pt.qrc b/tracker-pt/module/ftnoir_tracker_pt.qrc
deleted file mode 100644
index dfeb7369..00000000
--- a/tracker-pt/module/ftnoir_tracker_pt.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Resources/Logo_IR.png</file>
-    </qresource>
-</RCC>
diff --git a/tracker-pt/module/tracker_pt.qrc b/tracker-pt/module/tracker_pt.qrc
new file mode 100644
index 00000000..dfeb7369
--- /dev/null
+++ b/tracker-pt/module/tracker_pt.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Resources/Logo_IR.png</file>
+    </qresource>
+</RCC>
diff --git a/tracker-pt/tracker_pt_base.qrc b/tracker-pt/tracker_pt_base.qrc
new file mode 100644
index 00000000..8c270540
--- /dev/null
+++ b/tracker-pt/tracker_pt_base.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Resources/cap_front.png</file>
+        <file>Resources/cap_side.png</file>
+        <file>Resources/clip_front.png</file>
+        <file>Resources/clip_side.png</file>
+    </qresource>
+</RCC>
-- 
cgit v1.2.3