Skip to contentSkip to conversation

package/qjson: drop Qt4 patch

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 26, 2019 – Mar 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qjson: drop Qt4 patch

Now that Qt4 has been removed, drop patch

---
 ...-Qt4-package-error-in-CMakeLists.txt.patch | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch
package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch deleted +0 -26
deleted file mode 100644
index a9e34e4c26..0000000000
@@ -1,26 +0,0 @@
-From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001
-From: Zoltan Gyarmati <[email protected]>
-Date: Fri, 2 Dec 2016 23:00:58 +0100
-Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96
-
-Signed-off-by: Zoltan Gyarmati <[email protected]>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 31d9987..2fde79f 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND)
- ELSE()
-   MESSAGE ("Qt5 not found, searching for Qt4")
-   # Find Qt4
--  FIND_PACKAGE( Qt4 4.5 REQUIRED )
-+  FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore)
-   # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray
-   IF (NOT (${QT_VERSION_MINOR} STRLESS "8"))
-     MESSAGE ("Enable QStringBuilder")
--- 
-2.7.4
-
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/qjson: drop Qt4 patch

Quoted 7 lines · On Tue, 26 Mar 2019 22:52:40 +0100 Fabrice Fontaine…

Now that Qt4 has been removed, drop patch

---
 ...-Qt4-package-error-in-CMakeLists.txt.patch | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com