summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt3
-rw-r--r--Main.qml4
-rw-r--r--main.cpp4
3 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d68a93..3a92f17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,8 @@ target_link_libraries(appeurydice
PRIVATE
Qt6::Widgets
Qt6::Quick
- qcustomplot-qt6
+ #qcustomplot-qt6
+ qcustomplot
)
target_compile_definitions(app${PROJECT_NAME} PRIVATE QCUSTOMPLOT_USE_LIBRARY)
diff --git a/Main.qml b/Main.qml
index ef85a27..606998f 100644
--- a/Main.qml
+++ b/Main.qml
@@ -22,8 +22,10 @@ ApplicationWindow {
// // pistache
// // readonly property string apiRoot: "http://rpi5:8080/v1"
+
// // qhttpserver
- readonly property string apiRoot: "http://rpi5:8081/v1"
+ // readonly property string apiRoot: "http://rpi5:8081/v1"
+ readonly property string apiRoot: "http://rpizero:8081/v1"
Shortcut {
sequence: "ctrl+q"
diff --git a/main.cpp b/main.cpp
index ddb71d0..60ae18c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,10 +20,14 @@ int main(
qmlRegisterType<QmlCustomPlot>("QmlCustomPlot", 1, 0, "QmlCustomPlot");
auto pixelsPlot = new QCustomPlot();
+#ifdef QCUSTOMPLOT_USE_OPENGL
pixelsPlot->setOpenGl(true);
+#endif
auto profilePlot = new QCustomPlot();
+#ifdef QCUSTOMPLOT_USE_OPENGL
profilePlot->setOpenGl(true);
+#endif
engine.rootContext()->setContextProperty("pixelsPlot", pixelsPlot);
engine.rootContext()->setContextProperty("profilePlot", profilePlot);