Blob Blame History Raw
diff -rNu lxqt-config-randr-0.1.2.orig/src/CMakeLists.txt lxqt-config-randr-0.1.2/src/CMakeLists.txt
--- lxqt-config-randr-0.1.2.orig/src/CMakeLists.txt	2013-11-10 04:46:16.000000000 +0100
+++ lxqt-config-randr-0.1.2/src/CMakeLists.txt	2016-05-14 20:06:36.861115510 +0200
@@ -1,5 +1,8 @@
 set(EXE_NAME lxqt-config-randr)
-find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5X11Extras)
 find_package(X11 REQUIRED)
 
 include(CheckFunctionExists)
@@ -60,12 +63,10 @@
 set( RESOURCES_SRC_FILES
     lxqtconfigrandr.qrc
 )
-QT4_WRAP_UI(UI_FILES ${UI_SOURCES_FILES} )
-QT4_WRAP_CPP(MOC_FILES ${MOC_SOURCES_FILES} )
-QT4_ADD_RESOURCES(RESOURCES_FILES ${RESOURCES_SRC_FILES} )
-#QT4_ADD_TRANSLATION(RAZORRANDR_QM ${RAZORRANDR_TS} )
-
-include(${QT_USE_FILE})
+QT5_WRAP_UI(UI_FILES ${UI_SOURCES_FILES} )
+QT5_WRAP_CPP(MOC_FILES ${MOC_SOURCES_FILES} )
+QT5_ADD_RESOURCES(RESOURCES_FILES ${RESOURCES_SRC_FILES} )
+#QT5_ADD_TRANSLATION(RAZORRANDR_QM ${RAZORRANDR_TS} )
 
 INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -81,10 +82,10 @@
 )
 
 target_link_libraries(${EXE_NAME}
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
     ${X11_LIBRARIES}
     ${XRANDR_LIBRARY}
 )
 
+qt5_use_modules (${EXE_NAME} Widgets)
+
 install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin)
diff -rNu lxqt-config-randr-0.1.2.orig/src/legacyrandrscreen.cpp lxqt-config-randr-0.1.2/src/legacyrandrscreen.cpp
--- lxqt-config-randr-0.1.2.orig/src/legacyrandrscreen.cpp	2013-11-10 04:46:16.000000000 +0100
+++ lxqt-config-randr-0.1.2/src/legacyrandrscreen.cpp	2016-05-14 20:08:19.349024489 +0200
@@ -21,7 +21,7 @@
 #include <QtCore/QDebug>
 #include <QtGui/QLabel>
 #include <QtGui/QDesktopWidget>
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <QtCore/QTimer>
 #include <QtGui/QPixmap>