1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vulkan: Fix shadow builds

Browse Source 
Change-Id: I6529c76109e2d668355524b9b0d65048a6d3df2e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Andy Nichols 2017-03-27 20:45:36 +02:00 committed by Laszlo Agocs
parent 5c2d177552
commit 8a6b20eb0e
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/vulkan/qvulkanfunctions.cpp
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "qvulkanfunctions_p.h" #include <private/qvulkanfunctions_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/gui/vulkan/qvulkaninstance.cpp
View File

@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include "qvulkaninstance.h" #include "qvulkaninstance.h"
#include "qvulkanfunctions_p.h" #include <private/qvulkanfunctions_p.h>
#include <qpa/qplatformvulkaninstance.h> #include <qpa/qplatformvulkaninstance.h>
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>

12
src/gui/vulkan/vulkan.pri
View File

@ -1,4 +1,6 @@
qtConfig(vulkan) { qtConfig(vulkan) {
CONFIG += generated_privates
HEADERS += \ HEADERS += \
vulkan/qvulkaninstance.h \ vulkan/qvulkaninstance.h \
vulkan/qplatformvulkaninstance.h \ vulkan/qplatformvulkaninstance.h \
@ -21,7 +23,7 @@ QMAKE_QVKGEN_LICENSE_HEADER = $$QT_SOURCE_TREE/header.LGPL
qtPrepareTool(QMAKE_QVKGEN, qvkgen) 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.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 qvkgen_h.input = QMAKE_QVKGEN_INPUT
qtConfig(vulkan): \ qtConfig(vulkan): \
qvkgen_h.variable_out = HEADERS qvkgen_h.variable_out = HEADERS
@ -30,9 +32,9 @@ else: \
QMAKE_EXTRA_COMPILERS += qvkgen_h QMAKE_EXTRA_COMPILERS += qvkgen_h
qvkgen_ph.commands = $$escape_expand(\\n) 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.input = QMAKE_QVKGEN_INPUT
qvkgen_ph.depends += vulkan/qvulkanfunctions.h qvkgen_ph.depends += $$OUT_PWD/vulkan/qvulkanfunctions.h
qtConfig(vulkan): \ qtConfig(vulkan): \
qvkgen_ph.variable_out = HEADERS qvkgen_ph.variable_out = HEADERS
else: \ else: \
@ -40,9 +42,9 @@ else: \
QMAKE_EXTRA_COMPILERS += qvkgen_ph QMAKE_EXTRA_COMPILERS += qvkgen_ph
qvkgen_pimpl.commands = $$escape_expand(\\n) 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.input = QMAKE_QVKGEN_INPUT
qvkgen_pimpl.depends += vulkan/qvulkanfunctions_p.h qvkgen_pimpl.depends += $$OUT_PWD/vulkan/qvulkanfunctions_p.h
qtConfig(vulkan): \ qtConfig(vulkan): \
qvkgen_pimpl.variable_out = SOURCES qvkgen_pimpl.variable_out = SOURCES
else: \ else: \

2
sync.profile
View File

@ -84,5 +84,5 @@ my @zlib_headers = ( "zconf.h", "zlib.h" );
@ignore_for_qt_begin_namespace_check = ( "qt_windows.h", @zlib_headers, @angle_headers); @ignore_for_qt_begin_namespace_check = ( "qt_windows.h", @zlib_headers, @angle_headers);
%inject_headers = ( %inject_headers = (
"$basedir/src/corelib/global" => [ "qconfig.h", "qconfig_p.h" ], "$basedir/src/corelib/global" => [ "qconfig.h", "qconfig_p.h" ],
"$basedir/src/gui/vulkan" => [ "^qvulkanfunctions.h" ] "$basedir/src/gui/vulkan" => [ "^qvulkanfunctions.h", "^qvulkanfunctions_p.h" ]
); );