summaryrefslogtreecommitdiffhomepage
path: root/tracker-pt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-01-19 14:33:08 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-01-19 14:34:22 +0100
commitcca740afeaa3c4d79035546bf77935efe38830b1 (patch)
treecb2e1348b6268b65a55d40f4b16d5653a4b32e23 /tracker-pt
parent8017f3ae7cbcd5cee60b60da6be87597d17b45f7 (diff)
tracker/pt: fix broken resources
Spotted by: @cpuwolf Issue: #718
Diffstat (limited to 'tracker-pt')
-rw-r--r--tracker-pt/FTNoIR_PT_Controls.ui2
-rw-r--r--tracker-pt/ftnoir_tracker_pt_dialog.cpp4
-rw-r--r--tracker-pt/module/tracker_pt.qrc (renamed from tracker-pt/module/ftnoir_tracker_pt.qrc)0
-rw-r--r--tracker-pt/tracker_pt_base.qrc (renamed from tracker-pt/ftnoir_tracker_pt.qrc)0
4 files changed, 5 insertions, 1 deletions
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_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/tracker_pt.qrc
index dfeb7369..dfeb7369 100644
--- a/tracker-pt/module/ftnoir_tracker_pt.qrc
+++ b/tracker-pt/module/tracker_pt.qrc
diff --git a/tracker-pt/ftnoir_tracker_pt.qrc b/tracker-pt/tracker_pt_base.qrc
index 8c270540..8c270540 100644
--- a/tracker-pt/ftnoir_tracker_pt.qrc
+++ b/tracker-pt/tracker_pt_base.qrc