Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/qjson: drop Qt4 patch
@ 2019-03-26 21:52 Fabrice Fontaine
  2019-03-27 19:12 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2019-03-26 21:52 UTC (permalink / raw)
  To: buildroot

Now that Qt4 has been removed, drop patch

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-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

diff --git a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch b/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch
deleted file mode 100644
index a9e34e4c26..0000000000
--- a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001
-From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
-Date: Fri, 2 Dec 2016 23:00:58 +0100
-Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96
-
-Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
----
- 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
-
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH 1/1] package/qjson: drop Qt4 patch
  2019-03-26 21:52 [Buildroot] [PATCH 1/1] package/qjson: drop Qt4 patch Fabrice Fontaine
@ 2019-03-27 19:12 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2019-03-27 19:12 UTC (permalink / raw)
  To: buildroot

On Tue, 26 Mar 2019 22:52:40 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Now that Qt4 has been removed, drop patch
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...-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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-03-27 19:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-26 21:52 [Buildroot] [PATCH 1/1] package/qjson: drop Qt4 patch Fabrice Fontaine
2019-03-27 19:12 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox