From 700f6f6b5fd5dd9975200cb22a9251e811963d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Wed, 11 Sep 2019 13:00:54 +0200
Subject: [PATCH] meson: Improve Qt examples

Qt dependencies have been moved to the main build file where the
rest of dependencies are located. This makes it easier to find them.

The included directories has also reviewed and removed the
unnecessary ones.
---
 examples/C/qt/meson.build | 13 +++----------
 meson.build               |  5 +++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/examples/C/qt/meson.build b/examples/C/qt/meson.build
index c3487af4a0..172502a210 100644
--- a/examples/C/qt/meson.build
+++ b/examples/C/qt/meson.build
@@ -4,18 +4,11 @@ examples = [
   ['change-ipv4-addresses', []],
 ]
 
-incs = [
-  top_inc,
-  libnm_core_inc,
-]
-
-qt_core_dep = dependency('QtCore', version: '>= 4')
-
 deps = [
   dbus_dep,
   qt_core_dep,
-  dependency('QtDBus'),
-  dependency('QtNetwork'),
+  qt_dbus_dep,
+  qt_network_dep,
 ]
 
 moc = find_program('moc-qt4', required: false)
@@ -39,7 +32,7 @@ foreach example: examples
   executable(
     example[0],
     example[0] + '.cpp',
-    include_directories: incs,
+    include_directories: libnm_core_inc,
     dependencies: deps,
     link_depends: example[1],
   )
diff --git a/meson.build b/meson.build
index 969ac382d5..4f93dd3a9a 100644
--- a/meson.build
+++ b/meson.build
@@ -840,6 +840,11 @@ subdir('examples/C/glib')
 enable_qt = get_option('qt')
 if enable_qt
   add_languages('cpp')
+
+  qt_core_dep = dependency('QtCore', version: '>= 4')
+  qt_dbus_dep = dependency('QtDBus')
+  qt_network_dep = dependency('QtNetwork')
+
   subdir('examples/C/qt')
 endif