tray monitor: port to qt5

bareos · Oct 2, 2018 · 7225e69 · 7225e69
1 parent eed9ddc
commit 7225e69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/src/qt-tray-monitor/CMakeLists.txt b/core/src/qt-tray-monitor/CMakeLists.txt
@@ -29,8 +29,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-
-find_package(Qt4 REQUIRED)
+find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
 
 IF(HAVE_WIN32)
    include_directories(
@@ -50,14 +49,18 @@ IF(HAVE_WIN32)
    LIST(APPEND SOURCES ../win32/qt-tray-monitor/traymon.rc)
 ENDIF()
 
-set(TRAYMON_LIBRARIES bareos-tray-monitor Qt4::QtGui bareos)
+
+set(TRAYMON_LIBRARIES bareos-tray-monitor bareos)
+
 
 IF(HAVE_WIN32)
    add_executable(bareos-tray-monitor WIN32 ${SOURCES} main.qrc)
 ELSE()
    add_executable(bareos-tray-monitor ${SOURCES} main.qrc)
 ENDIF()
 
+qt5_use_modules(bareos-tray-monitor Widgets)
+
 target_link_libraries(${TRAYMON_LIBRARIES})
 
 INSTALL(TARGETS bareos-tray-monitor DESTINATION "${bindir}")

diff --git a/core/src/qt-tray-monitor/traymenu.cc b/core/src/qt-tray-monitor/traymenu.cc
@@ -46,8 +46,7 @@ void TrayMenu::createAction(QString objName, QString text, QWidget* mainWindow)
 {
    const QString& translate = QApplication::translate("TrayMonitor",
                                                        text.toUtf8(),
-                                                       0,
-                                                       QApplication::UnicodeUTF8);
+                                                       0);
 
    QAction *action = new QAction(translate, mainWindow);