diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-08 13:33:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-08 13:33:09 +0100 |
| commit | 34ff69fba1cc017e5a26e5f79ffcd4ac6945061f (patch) | |
| tree | d95aef2df41698982400e48e66a2de8c9f659cda /tools | |
| parent | 8419ff45d4f99e585119fa77a1066d4ddaee827c (diff) | |
| parent | f6e8dfb82328c21228837e18a0ec8f6287a1b485 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I26b71c801e63bec11e495244d5a4bf301c7d4380
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index b68e8f91a2..75e474ba70 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -79,10 +79,8 @@ qmlcache_loader.dependency_type = TYPE_C qmlcache_loader.CONFIG = combine unix:!no_qmlcache_depend { - compiler_bin = $$[QT_HOST_BINS]/qmlcachegen - contains(QMAKE_HOST.os, Windows): compiler_bin = $${compiler_bin}.exe - qmlcache.depends += $$compiler_bin - qmlcache_loader.depends += $$compiler_bin + qmlcache.depends += $$QML_CACHEGEN + qmlcache_loader.depends += $$QML_CACHEGEN } QMAKE_EXTRA_COMPILERS += qmlcache qmlcache_loader |