zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lxqt-connman-applet: fix build with Qt 5.11, don't use qt5_use_modules

Browse Source 
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
This commit is contained in:
Max Krummenacher
2018-05-06 14:49:30 +02:00
parent ae9d2f0cb9
commit 3bd767af3d
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
recipes-lxqt/lxqt-connman-applet/lxqt-connman-applet/0001-CMakeLists.txt-Fix-build-with-Qt-5.11_beta3-dropping.patch Normal file
View File

@@ -0,0 +1,54 @@
From baf2e11e76a0d1d562abeb53e5e3e5a916138163 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sun, 6 May 2018 11:37:20 +0000
Subject: [PATCH] CMakeLists.txt: Fix build with Qt 5.11_beta3 (dropping
qt5_use_modules)
| CMake Error at .../CMakeLists.txt (qt5_use_modules):
| Unknown CMake command "qt5_use_modules".
Upstream-Status: Submitted [https://github.com/lxqt/lxqt-connman-applet/pull/19]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
CMakeLists.txt | 4 +---
iconviewer/CMakeLists.txt | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e06d783..6aad304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,11 +66,9 @@ add_executable(${PROJECT_NAME}
${QM_LOADER}
)
-qt5_use_modules(lxqt-connman-applet Core Widgets DBus)
-
-
target_link_libraries(${PROJECT_NAME}
lxqt
+ Qt5::Core
Qt5::Widgets
Qt5::DBus
Qt5::Svg)
diff --git a/iconviewer/CMakeLists.txt b/iconviewer/CMakeLists.txt
index 4115996..6e31e83 100644
--- a/iconviewer/CMakeLists.txt
+++ b/iconviewer/CMakeLists.txt
@@ -36,11 +36,9 @@ add_executable(${PROJECT_NAME}
${QRCS_GENERATED}
)
-qt5_use_modules(icon-viewer Core Widgets)
-
-
target_link_libraries(${PROJECT_NAME}
lxqt
+ Qt5::Core
Qt5::Widgets
Qt5::Svg)
--
2.13.6

1
recipes-lxqt/lxqt-connman-applet/lxqt-connman-applet_git.bb
View File

@@ -10,6 +10,7 @@ DEPENDS += " \
qtsvg \
"
SRC_URI += "file://0001-CMakeLists.txt-Fix-build-with-Qt-5.11_beta3-dropping.patch"
SRCREV = "940493ce509bb2784738d547cc27df677b4835a2"
PV = "0"