diff options
| author | Janne Koskinen <janne.p.koskinen@qt.io> | 2020-10-21 11:45:34 +0300 |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@qt.io> | 2020-10-21 12:17:00 +0300 |
| commit | 947ff0377e17e0154111afbbaab623f9491c1051 (patch) | |
| tree | 4d335ba4dff28ed93b66b2f52babe4bf4e36b0dc /src/Authoring | |
| parent | f7b06da43e99b9631f6be222ed344e62c2005d77 (diff) | |
Fix 5.15 build on Windows
Use $$files, * wildcard returns empty on 5.15 qmake resulting
"Error: cycle in targets detected" in makefile generation.
Change-Id: I9bd2cdef7c35493949f34849c51c077734adc8d2
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring')
| -rw-r--r-- | src/Authoring/Qt3DStudio/Qt3DStudio.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Authoring/Qt3DStudio/Qt3DStudio.pro b/src/Authoring/Qt3DStudio/Qt3DStudio.pro index 4043d027..57cbc68e 100644 --- a/src/Authoring/Qt3DStudio/Qt3DStudio.pro +++ b/src/Authoring/Qt3DStudio/Qt3DStudio.pro @@ -113,7 +113,7 @@ STATICRUNTIME = \ -lQT3DSDM$$qtPlatformTargetSuffix() \ -lCommonLib$$qtPlatformTargetSuffix() \ -lCoreLib$$qtPlatformTargetSuffix() \ - -lqt3dsruntimestatic$$qtPlatformTargetSuffix() \ + -lqt3dsruntimestatic$$qtPlatformTargetSuffix() } else { LIBS += $$STATICRUNTIME QMAKE_LFLAGS += /NODEFAULTLIB:tinyxml.lib @@ -499,19 +499,19 @@ ABS_PRJ_ROOT = $$absolute_path($$PWD/../../..) macos:ABS_DEST_DIR = $$absolute_path($$BINDIR)/$${TARGET}.app/Contents/Resources !macos:ABS_DEST_DIR = $$absolute_path($$BINDIR) -copy_content.files = $$PWD/../../Runtime/ogl-runtime/Studio/* +copy_content.files = $$files($$PWD/../../Runtime/ogl-runtime/Studio/*) copy_content.path = $$ABS_DEST_DIR COPIES += copy_content -install_content.files = $$PWD/../../Runtime/ogl-runtime/Studio/* +install_content.files = $$files($$PWD/../../Runtime/ogl-runtime/Studio/*,true) install_content.path = $$[QT_INSTALL_BINS] INSTALLS += install_content -copy_buildconfig.files = $$PWD/../../../Studio/* +copy_buildconfig.files = $$files($$PWD/../../../Studio/*) copy_buildconfig.path = $$ABS_DEST_DIR COPIES += copy_buildconfig -install_buildconfig.files = $$PWD/../../../Studio/* +install_buildconfig.files = $$files($$PWD/../../../Studio/*,true) install_buildconfig.path = $$[QT_INSTALL_BINS] INSTALLS += install_buildconfig |