blob: 78e263aaa9c24cf8d2a29d41519da9f0b3b1e924 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b060dc4..c46af92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,10 @@ project(obs-qmlview)
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
set(CMAKE_AUTOMOC TRUE)
+include(FindLibobs.cmake)
+find_package(LibObs REQUIRED)
+
+
find_package(Qt5Quick REQUIRED)
if(NOT Qt5Quick_FOUND)
if (ENABLE_UI)
@@ -64,4 +68,14 @@ target_link_libraries(obs-qmlview
Qt5::Widgets
Qt5::WebEngine
)
-install_obs_plugin_with_data(obs-qmlview data)
+
+#install_obs_plugin_with_data(obs-qmlview data)
+
+set_target_properties(obs-qmlview PROPERTIES PREFIX "")
+
+install(TARGETS obs-qmlview
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
+
+#install(DIRECTORY data/locale/
+# DESTINATION
+# "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/obs-qmlview/locale")
diff --git a/qmlview.h b/qmlview.h
index 6919f55..c9cc37e 100644
--- a/qmlview.h
+++ b/qmlview.h
@@ -83,7 +83,7 @@ signals:
void qmlWarnings(QStringList warnings);
private slots:
- void doSnap();
+// void doSnap();
void doLoad();
void doUnload();
void doResize(quint32 w, quint32 h);
diff --git a/renderer.h b/renderer.h
index 5ed5f51..01fe0c4 100644
--- a/renderer.h
+++ b/renderer.h
@@ -145,7 +145,7 @@ public slots:
bool initialised() { return m_quickInitialized; }
QVariant getQuery();
- void requestUpdate();
+ //void requestUpdate();
QStringList loadMessages() { return m_loadMessages; }
void addMessages(const QStringList &msgs) { m_loadMessages << msgs; }
|
