0001-Fix-plugins-build-dependency.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. From 3ac051c4549575634cecc706175b019f4ed4c3bf Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Sat, 22 Jul 2017 22:47:05 +0200
  4. Subject: Fix plugins build dependency
  5. Do not build the plugins before the dependency on module positioning for
  6. the plugin subdir position is available.
  7. Task-number: QTBUG-62098
  8. Change-Id: Ic7473db937359f3dad47aef0ffa3671be8cbd349
  9. Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
  10. Upstream: https://code.qt.io/cgit/qt/qtlocation.git/patch/?id=3ac051c4549575634cecc706175b019f4ed4c3bf
  11. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  12. ---
  13. src/src.pro | 3 +--
  14. 1 file changed, 1 insertion(+), 2 deletions(-)
  15. diff --git a/src/src.pro b/src/src.pro
  16. index d0a1ee4e7..0c0bf50b1 100644
  17. --- a/src/src.pro
  18. +++ b/src/src.pro
  19. @@ -7,8 +7,6 @@ SUBDIRS += positioning
  20. positioning.depends = 3rdparty/clip2tri
  21. qtHaveModule(quick) {
  22. - plugins.depends += positioning
  23. -
  24. SUBDIRS += location
  25. location.depends += positioning 3rdparty/clip2tri
  26. @@ -18,6 +16,7 @@ qtHaveModule(quick) {
  27. imports.depends += positioning location
  28. }
  29. +plugins.depends += positioning
  30. SUBDIRS += plugins
  31. !android:contains(QT_CONFIG, private_tests) {
  32. --
  33. cgit v1.1-6-g87c4