Two minor fixes after libmyth->libmythui changes.

1) Change mythexp.h -> mythuiexp.h for moved file. 2) Fix building if QtWebKit isn't present.
MythTV · Dec 30, 2024 · db3c623 · db3c623
1 parent 6760a08
commit db3c623
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mythtv/libs/libmythui/CMakeLists.txt b/mythtv/libs/libmythui/CMakeLists.txt
@@ -65,7 +65,6 @@ set(HEADERS_TO_INSTALL
     mythuitype.h
     mythuiutils.h
     mythuivideo.h
-    mythuiwebbrowser.h
     mythvirtualkeyboard.h
     schemawizard.h
     standardsettings.h
@@ -203,6 +202,7 @@ if(TARGET Qt5::AndroidExtras)
 endif()
 
 if(TARGET Qt${QT_VERSION_MAJOR}::WebKit)
+  list(APPEND HEADERS_TO_INSTALL mythuiwebbrowser.h)
   target_sources(mythui PRIVATE mythuiwebbrowser.cpp mythuiwebbrowser.h)
   target_link_libraries(mythui PUBLIC Qt${QT_VERSION_MAJOR}::WebKit
                                       Qt${QT_VERSION_MAJOR}::WebKitWidgets)

diff --git a/mythtv/libs/libmythui/mediamonitor.h b/mythtv/libs/libmythui/mediamonitor.h
@@ -8,9 +8,9 @@
 #include <QList>
 #include <QDateTime>
 
-#include "libmyth/mythexp.h"
 #include "libmythbase/mthread.h"
 #include "libmythbase/mythmedia.h"
+#include "libmythui/mythuiexp.h"
 
 /// Stores details of media handlers
 
@@ -42,7 +42,7 @@ class MonitorThread : public MThread
     QDateTime m_lastCheckTime;
 };
 
-class MPUBLIC MediaMonitor : public QObject
+class MUI_PUBLIC MediaMonitor : public QObject
 {
     Q_OBJECT
     friend class MonitorThread;