From 8a6b20eb0e98d781a1bec49c16409ca29eee0185 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@qt.io>
Date: Mon, 27 Mar 2017 20:45:36 +0200
Subject: Vulkan: Fix shadow builds

Change-Id: I6529c76109e2d668355524b9b0d65048a6d3df2e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 src/gui/vulkan/qvulkanfunctions.cpp |  2 +-
 src/gui/vulkan/qvulkaninstance.cpp  |  2 +-
 src/gui/vulkan/vulkan.pri           | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/gui/vulkan')

diff --git a/src/gui/vulkan/qvulkanfunctions.cpp b/src/gui/vulkan/qvulkanfunctions.cpp
index c342535780..c5f9616d20 100644
--- a/src/gui/vulkan/qvulkanfunctions.cpp
+++ b/src/gui/vulkan/qvulkanfunctions.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qvulkanfunctions_p.h"
+#include <private/qvulkanfunctions_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp
index 24ffb4429b..c2ec5eccc1 100644
--- a/src/gui/vulkan/qvulkaninstance.cpp
+++ b/src/gui/vulkan/qvulkaninstance.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qvulkaninstance.h"
-#include "qvulkanfunctions_p.h"
+#include <private/qvulkanfunctions_p.h>
 #include <qpa/qplatformvulkaninstance.h>
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformnativeinterface.h>
diff --git a/src/gui/vulkan/vulkan.pri b/src/gui/vulkan/vulkan.pri
index b9d2a9b4b5..dab8725de7 100644
--- a/src/gui/vulkan/vulkan.pri
+++ b/src/gui/vulkan/vulkan.pri
@@ -1,4 +1,6 @@
 qtConfig(vulkan) {
+    CONFIG += generated_privates
+
     HEADERS += \
         vulkan/qvulkaninstance.h \
         vulkan/qplatformvulkaninstance.h \
@@ -21,7 +23,7 @@ QMAKE_QVKGEN_LICENSE_HEADER = $$QT_SOURCE_TREE/header.LGPL
 qtPrepareTool(QMAKE_QVKGEN, qvkgen)
 
 qvkgen_h.commands = $$QMAKE_QVKGEN ${QMAKE_FILE_IN} $$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER) ${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}
-qvkgen_h.output = vulkan/qvulkanfunctions.h
+qvkgen_h.output = $$OUT_PWD/vulkan/qvulkanfunctions.h
 qvkgen_h.input = QMAKE_QVKGEN_INPUT
 qtConfig(vulkan): \
     qvkgen_h.variable_out = HEADERS
@@ -30,9 +32,9 @@ else: \
 QMAKE_EXTRA_COMPILERS += qvkgen_h
 
 qvkgen_ph.commands = $$escape_expand(\\n)
-qvkgen_ph.output = vulkan/qvulkanfunctions_p.h
+qvkgen_ph.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.h
 qvkgen_ph.input = QMAKE_QVKGEN_INPUT
-qvkgen_ph.depends += vulkan/qvulkanfunctions.h
+qvkgen_ph.depends += $$OUT_PWD/vulkan/qvulkanfunctions.h
 qtConfig(vulkan): \
     qvkgen_ph.variable_out = HEADERS
 else: \
@@ -40,9 +42,9 @@ else: \
 QMAKE_EXTRA_COMPILERS += qvkgen_ph
 
 qvkgen_pimpl.commands = $$escape_expand(\\n)
-qvkgen_pimpl.output = vulkan/qvulkanfunctions_p.cpp
+qvkgen_pimpl.output = $$OUT_PWD/vulkan/qvulkanfunctions_p.cpp
 qvkgen_pimpl.input = QMAKE_QVKGEN_INPUT
-qvkgen_pimpl.depends += vulkan/qvulkanfunctions_p.h
+qvkgen_pimpl.depends += $$OUT_PWD/vulkan/qvulkanfunctions_p.h
 qtConfig(vulkan): \
     qvkgen_pimpl.variable_out = SOURCES
 else: \
-- 
cgit v1.2.3