From ea913750b8793e1e518bd0eabc338e557df5ee6c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 12 Oct 2016 11:55:52 +0200
Subject: create modularized version of qtplatformsupport module

lumping together all kinds of unrelated stuff has caused problems with
spurious dependencies from the beginning. as the modularization infra is
now in a state which supports many small private libraries just fine,
take advantage of it.

Change-Id: Ic40f47ce76a308bbfd32deae281f6f064fe1ef4c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/platformsupport/input/evdevtouch')

diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
index d0c6c10224..ab71d08fb1 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
@@ -43,7 +43,7 @@
 #include <QStringList>
 #include <QGuiApplication>
 #include <QLoggingCategory>
-#include <QtPlatformSupport/private/qdevicediscovery_p.h>
+#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
 
-- 
cgit v1.2.3


From 04f0a69e96fca03c18e0c7eaaab7babc49e35198 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 25 Oct 2016 15:22:01 +0200
Subject: Replace PKGCONFIG+=foo usages with QMAKE_USE

replace explicit pkg-config uses with the results of configure tests,
for consistency.

Change-Id: I3587db6085798ea7a49f8871fc6838eb687a6391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/platformsupport/input/evdevtouch/evdevtouch.pri | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/platformsupport/input/evdevtouch')

diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri
index 58fafcd8f9..0ad236e882 100644
--- a/src/platformsupport/input/evdevtouch/evdevtouch.pri
+++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri
@@ -12,6 +12,5 @@ qtConfig(libudev): \
     QMAKE_USE_PRIVATE += libudev
 
 qtConfig(mtdev) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG_PRIVATE += mtdev
+    QMAKE_USE_PRIVATE += mtdev
 }
-- 
cgit v1.2.3