diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-30 01:00:08 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-30 01:00:08 +0100 |
commit | 2752a4632e94e2687655087d0d7f98b6b16e16a9 (patch) | |
tree | 3d9fe294e67cd5f5ae12a0004d467ec7b5b7bf51 /tools/qmlcachegen | |
parent | 070eb7bdde4f9e6e814c3afc593368918fd445af (diff) | |
parent | d0a52c72b5756787ceb6094117cd71d935badc06 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ie977b1998eba8c9aa8582a96132bf1aa0ec55ca4
Diffstat (limited to 'tools/qmlcachegen')
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro index 9662690395..bee0b9a37e 100644 --- a/tools/qmlcachegen/qmlcachegen.pro +++ b/tools/qmlcachegen/qmlcachegen.pro @@ -24,6 +24,7 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { load(qt_build_paths) +equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" cmake_config_file.input = $$PWD/Qt5QuickCompilerConfig.cmake.in cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake QMAKE_SUBSTITUTES += cmake_config_file |