summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-17 16:51:24 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-18 10:37:08 +0300
commit7260150d6ad25219acae75e631ab4000ce85a481 (patch)
tree321084e34957aaaab8a43560c94022ba053f66bb
parent87210f0f4ecc22d0faf2a01499ce10cf6defabaf (diff)
Fix libinfix builds in CI
Change-Id: I2c6bc05f9777cc33e5c923f500f2337245de10aa Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r--qt3dstudio.pro8
1 files changed, 4 insertions, 4 deletions
diff --git a/qt3dstudio.pro b/qt3dstudio.pro
index 53c06789..56e18268 100644
--- a/qt3dstudio.pro
+++ b/qt3dstudio.pro
@@ -62,9 +62,9 @@ load(qt_parts)
# copy QtStudio3D.dll
release {
- QTSTUDIO3D_LIB = Qt5Studio3D.dll
+ QTSTUDIO3D_LIB = Qt5Studio3D$${QT_LIBINFIX}.dll
} else {
- QTSTUDIO3D_LIB = Qt5Studio3Dd.dll
+ QTSTUDIO3D_LIB = Qt5Studio3D$${QT_LIBINFIX}d.dll
}
QMAKE_EXTRA_TARGETS += copyStudio3D
deployTarget.depends += copyStudio3D
@@ -110,9 +110,9 @@ load(qt_parts)
# use case for this is gathering installer content in CI after everything is
# already built, this shouldn't be a problem.
release {
- RUNTIME2_LIB = Qt53DStudioRuntime2.dll
+ RUNTIME2_LIB = Qt53DStudioRuntime2$${QT_LIBINFIX}.dll
} else {
- RUNTIME2_LIB = Qt53DStudioRuntime2d.dll
+ RUNTIME2_LIB = Qt53DStudioRuntime2$${QT_LIBINFIX}d.dll
}
QMAKE_EXTRA_TARGETS += copyRuntime2
deployTarget.depends += copyRuntime2