sddm: fix build with Qt 5.11, don't use qt5_use_modules
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From b10ce97f03cb8c6aa6e6e9bbbbb0ccd134022c0c Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Sat, 28 Apr 2018 11:38:32 +0200
|
||||
Subject: [PATCH] Fix build with Qt 5.11 (#1024)
|
||||
|
||||
qt5_use_modules was deprecated for quite some time and got finally removed.
|
||||
|
||||
(cherry picked from commit 287e4b11b940140764131a04dfb4afb3a3d8a84d)
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
|
||||
Conflicts:
|
||||
CMakeLists.txt
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
test/CMakeLists.txt | 3 +--
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 005c9ad..71b46d7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
|
||||
find_package(XKB REQUIRED)
|
||||
|
||||
# Qt 5
|
||||
-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
|
||||
+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
|
||||
|
||||
# find qt5 imports dir
|
||||
get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index c9d935a..bb85ddd 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
|
||||
|
||||
include_directories(../src/common)
|
||||
|
||||
-
|
||||
set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
|
||||
add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
|
||||
add_test(NAME Configuration COMMAND ConfigurationTest)
|
||||
|
||||
-qt5_use_modules(ConfigurationTest Test)
|
||||
+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@@ -19,6 +19,7 @@ SRC_URI = " \
|
||||
git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
|
||||
file://0001-fix-qml-install-dir.patch \
|
||||
file://0002-do-not-create-example-configutation-we-cannot-run-sd.patch \
|
||||
file://0001-Fix-build-with-Qt-5.11-1024.patch \
|
||||
file://sddm.pam \
|
||||
file://sddm-autologin.pam \
|
||||
file://sddm.conf \
|
||||
|
||||
Reference in New Issue
Block a user