From 773999816ee250a50f93a6716ef3ea940583b762 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals.cid@kdab.com>
Date: Thu, 31 Jan 2019 16:31:05 +0100
Subject: [PATCH] cmake: glib changed name to glib2

Change-Id: I4a86bd3b01e1fe307e9802182df943245a7fce4c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/corelib/CMakeLists.txt                          | 2 +-
 src/corelib/configure.cmake                         | 6 +++---
 src/platformsupport/eventdispatchers/CMakeLists.txt | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index a847d07adef..2ade76d2f56 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -528,7 +528,7 @@ extend_target(Core CONDITION UNIX AND QT_FEATURE_clock_gettime
 extend_target(Core CONDITION QT_FEATURE_glib
     SOURCES
         kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
-    LIBRARIES PkgConfig::GLib
+    LIBRARIES GLIB2::GLIB2
 )
 
 ## poll_select:
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index a30f8d1bca1..4c40aa1c281 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -10,8 +10,8 @@ set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu)
 
 #### Libraries
 
-find_package(GLib)
-set_package_properties(GLib PROPERTIES TYPE OPTIONAL)
+find_package(GLIB2)
+set_package_properties(GLIB2 PROPERTIES TYPE OPTIONAL)
 find_package(ICU COMPONENTS i18n uc data)
 set_package_properties(ICU PROPERTIES TYPE OPTIONAL)
 find_package(Libsystemd)
@@ -383,7 +383,7 @@ qt_feature("getentropy" PRIVATE
 qt_feature("glib" PUBLIC PRIVATE
     LABEL "GLib"
     AUTODETECT NOT WIN32
-    CONDITION GLib_FOUND
+    CONDITION GLIB2_FOUND
 )
 qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1")
 qt_feature("iconv" PUBLIC PRIVATE
diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
index 54a4287ccc4..f8898ea6725 100644
--- a/src/platformsupport/eventdispatchers/CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from eventdispatchers.pro.
 
-find_package(GLib)
+find_package(GLIB2)
 set_package_properties(GLib PROPERTIES TYPE OPTIONAL)
 
 #####################################################################
@@ -35,5 +35,5 @@ extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
     SOURCES
         qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
     LIBRARIES
-        PkgConfig::GLib
+        GLIB2::GLIB2
 )