diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-06-12 15:55:46 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-06-13 12:01:24 +0300 |
| commit | bb411c301cf02cba89086cee37b89a1963ddc76a (patch) | |
| tree | 943b5906abe65a65a56bf2a18a42e22b95b16f74 | |
| parent | 1f3496734103b219dfbff55f194ed1aa1e93541f (diff) | |
Fix developer buildv2.4.0-beta3
The wip/runtime2 branch already had the same problem. Copy the solution
from there.
Task-number: QT3DS-3660
Change-Id: I7d2440cac22dcb73515a687df008f50bc33b8d0c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | qt3dstudio.pro | 5 | ||||
| -rw-r--r-- | src/Authoring/Qt3DStudio/Qt3DStudio.pro | 11 | ||||
| -rw-r--r-- | src/commonplatform.pri | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/qt3dstudio.pro b/qt3dstudio.pro index 62f7e50d..cd964db6 100644 --- a/qt3dstudio.pro +++ b/qt3dstudio.pro @@ -9,11 +9,6 @@ requires(qtHaveModule(quick)) requires(qtHaveModule(qml)) requires(qtHaveModule(opengl)) -#TODO: QT3DS-3660 fix developer builds of Qt 3D Studio editor -linux:{ -requires(!contains(QT_CONFIG,private_tests)) -} - SUBDIRS += \ doc diff --git a/src/Authoring/Qt3DStudio/Qt3DStudio.pro b/src/Authoring/Qt3DStudio/Qt3DStudio.pro index e7bc3810..e4b57494 100644 --- a/src/Authoring/Qt3DStudio/Qt3DStudio.pro +++ b/src/Authoring/Qt3DStudio/Qt3DStudio.pro @@ -109,8 +109,15 @@ STATICRUNTIME = \ !mingw: QMAKE_LFLAGS += /NODEFAULTLIB:tinyxml.lib } -!macos { - LIBS += -lQt5Studio3D$$qtPlatformTargetSuffix() +if (qtHaveModule(3dstudio)) { + QT += 3dstudio 3dstudio-private +} else { + RUNTIME_LIB = $$qt5LibraryTarget(QtStudio3D$$QT_LIBINFIX) + macos { + LIBS += -framework QtStudio3D + } else { + LIBS += -l$$RUNTIME_LIB + } } LIBS += \ diff --git a/src/commonplatform.pri b/src/commonplatform.pri index 8c56d99d..3cdc3cad 100644 --- a/src/commonplatform.pri +++ b/src/commonplatform.pri @@ -296,15 +296,13 @@ win32 { BINDIR = $$MODULE_BASE_OUTDIR/bin LIBDIR = $$MODULE_BASE_OUTDIR/lib -!qtConfig(private_tests): { - # Non-developer build + +exists($$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/bin) { RUNTIME_BINDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/bin RUNTIME_LIBDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/lib RUNTIME_INCLUDEDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/include LIBS += -L"$$RUNTIME_LIBDIR" - } else { - # Developer build RUNTIME_BINDIR = $$BINDIR RUNTIME_LIBDIR = $$LIBDIR RUNTIME_INCLUDEDIR = $$MODULE_BASE_OUTDIR/include |