154 lines
5.5 KiB
Diff
154 lines
5.5 KiB
Diff
From e1e90aee9fb1a93fca8070d6be4a720af08bc3f3 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Pavlov <alexpux@gmail.com>
|
|
Date: Wed, 6 Dec 2017 08:23:31 +0300
|
|
Subject: [PATCH] Fix install locations
|
|
|
|
---
|
|
doc/doc.pro | 4 ++++
|
|
examples/studio3d/studio3d.pro | 2 +-
|
|
src/Authoring/Studio/Qt3DStudio.pro | 4 ++--
|
|
src/Viewer/Qt3DViewer/Qt3DViewer.pro | 2 +-
|
|
src/commonplatform.pri | 9 ++++-----
|
|
src/QtExtras/qmlstreamer/qmlstreamer.pro | 4 ++++
|
|
src/Runtime/AttributeHashes/AttributeHashes.pro | 3 +++
|
|
src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro | 3 +++
|
|
src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro | 4 ++++
|
|
src/Viewer/studio3d/studio3d.pro | 4 ++++
|
|
10 files changed, 30 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/doc/doc.pro b/doc/doc.pro
|
|
index 6a164c1..11b5ba0 100644
|
|
--- a/doc/doc.pro
|
|
+++ b/doc/doc.pro
|
|
@@ -17,3 +17,7 @@ OTHER_FILES += \
|
|
$$PWD/src/11-quick-start-guides/*.qdoc \
|
|
$$PWD/src/12-cpp-reference/*.qdoc \
|
|
$$PWD/src/images/*.*
|
|
+
|
|
+INSTALL_DOC_PATH = $$QT3DSTUDIO_PREFIX/share/doc/qt3dstudio
|
|
+inst_qch_docs.path = $$INSTALL_DOC_PATH
|
|
+inst_html_docs.path = $$INSTALL_DOC_PATH
|
|
diff --git a/examples/studio3d/studio3d.pro b/examples/studio3d/studio3d.pro
|
|
index e6f49b4..0bcd414 100644
|
|
--- a/examples/studio3d/studio3d.pro
|
|
+++ b/examples/studio3d/studio3d.pro
|
|
@@ -11,6 +11,6 @@
|
|
# Sample project only has the presentation.
|
|
# We do not want to pollute the sample folder with .pro file, so do the install here.
|
|
INSTALLS += sampleProject
|
|
- sampleProject.path = $$[QT_INSTALL_EXAMPLES]/studio3d/SampleProject
|
|
+ sampleProject.path = $$QT3DSTUDIO_PREFIX/share/qt5/examples/studio3d/SampleProject
|
|
sampleProject.files = SampleProject/*
|
|
}
|
|
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro
|
|
index e6f49b4..0bcd414 100644
|
|
--- a/src/Authoring/Studio/Qt3DStudio.pro
|
|
+++ b/src/Authoring/Studio/Qt3DStudio.pro
|
|
@@ -481,7 +481,7 @@ defineReplace(addFilesToResources) {
|
|
export($${1}.name)
|
|
|
|
$${1}_install.files = $$2
|
|
- $${1}_install.path = $$[QT_INSTALL_BINS]/$$3
|
|
+ $${1}_install.path = $$QT3DSTUDIO_PREFIX/bin/$$3
|
|
INSTALLS += $${1}_install
|
|
export($${1}_install.files)
|
|
export($${1}_install.path)
|
|
@@ -495,7 +495,7 @@ QMAKE_EXTRA_COMPILERS += $$addFilesToResources("copy2", "$$PWD/../../../Studio/B
|
|
|
|
CONFIG += exceptions
|
|
|
|
-target.path = $$[QT_INSTALL_BINS]
|
|
+target.path = $$QT3DSTUDIO_PREFIX/bin
|
|
INSTALLS += target
|
|
|
|
RC_ICONS = images/3D-studio.ico
|
|
diff --git a/src/Viewer/Qt3DViewer/Qt3DViewer.pro b/src/Viewer/Qt3DViewer/Qt3DViewer.pro
|
|
index 6f9a6e9..be53613 100644
|
|
--- a/src/Viewer/Qt3DViewer/Qt3DViewer.pro
|
|
+++ b/src/Viewer/Qt3DViewer/Qt3DViewer.pro
|
|
@@ -33,5 +33,5 @@ LIBS += \
|
|
|
|
macos:QMAKE_RPATHDIR += @executable_path/../../../../lib
|
|
|
|
-target.path = $$[QT_INSTALL_BINS]
|
|
+target.path = $$QT3DSTUDIO_PREFIX/bin
|
|
INSTALLS += target
|
|
diff --git a/src/commonplatform.pri b/src/commonplatform.pri
|
|
index 37c4b72..74ef0c2 100644
|
|
--- a/src/commonplatform.pri
|
|
+++ b/src/commonplatform.pri
|
|
@@ -107,9 +106,9 @@ LIBDIR = $$MODULE_BASE_OUTDIR/lib
|
|
LIBS += -L"$$LIBDIR"
|
|
!testcase {
|
|
contains(TEMPLATE, app) {
|
|
- DESTDIR = $$BINDIR
|
|
+ DESTDIR = $$QT3DSTUDIO_PREFIX/bin
|
|
} else {
|
|
- DESTDIR = $$LIBDIR
|
|
- win32: DLLDESTDIR = $$BINDIR
|
|
+ DESTDIR = $$QT3DSTUDIO_PREFIX/lib
|
|
+ win32: DLLDESTDIR = $$QT3DSTUDIO_PREFIX/bin
|
|
}
|
|
}
|
|
diff --git a/src/QtExtras/qmlstreamer/qmlstreamer.pro b/src/QtExtras/qmlstreamer/qmlstreamer.pro
|
|
index e8d77df..99a49bc 100644
|
|
--- a/src/QtExtras/qmlstreamer/qmlstreamer.pro
|
|
+++ b/src/QtExtras/qmlstreamer/qmlstreamer.pro
|
|
@@ -47,3 +47,7 @@ INCLUDEPATH += \
|
|
$$PWD/../QtExtras/qmlstreamer
|
|
|
|
macos:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
|
|
+
|
|
+target.path = $$QT3DSTUDIO_PREFIX/lib
|
|
+dlltarget.path = $$QT3DSTUDIO_PREFIX/bin
|
|
+INSTALLS += target
|
|
diff --git a/src/Runtime/AttributeHashes/AttributeHashes.pro b/src/Runtime/AttributeHashes/AttributeHashes.pro
|
|
index 3be119d..6894eaf 100644
|
|
--- a/src/Runtime/AttributeHashes/AttributeHashes.pro
|
|
+++ b/src/Runtime/AttributeHashes/AttributeHashes.pro
|
|
@@ -14,3 +14,6 @@ SOURCES += AttributeHashes.cpp
|
|
load(qt_tool)
|
|
|
|
INSTALLS -= target
|
|
+
|
|
+target.path = $$QT3DSTUDIO_PREFIX/bin
|
|
+INSTALLS += target
|
|
diff --git a/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro b/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
index fe5a84e..bcd63be 100644
|
|
--- a/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
+++ b/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
@@ -56,3 +56,6 @@ PRE_TARGETDEPS += $$fixLibPredeps($$LIBDIR, PREDEPS_LIBS)
|
|
|
|
load(qt_tool)
|
|
CONFIG -= relative_qt_rpath
|
|
+
|
|
+target.path = $$QT3DSTUDIO_PREFIX/bin
|
|
+INSTALLS += target
|
|
diff --git a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
index b44813b..dde957d 100644
|
|
--- a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
+++ b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
@@ -72,3 +72,7 @@ PREDEPS_LIBS = qt3dsruntimestatic
|
|
|
|
include(../../utils.pri)
|
|
PRE_TARGETDEPS += $$fixLibPredeps($$LIBDIR, PREDEPS_LIBS)
|
|
+
|
|
+target.path = $$QT3DSTUDIO_PREFIX/lib
|
|
+dlltarget.path = $$QT3DSTUDIO_PREFIX/bin
|
|
+INSTALLS += target
|
|
diff --git a/src/Viewer/studio3d/studio3d.pro b/src/Viewer/studio3d/studio3d.pro
|
|
index 403ee3a..b8dbac7 100644
|
|
--- a/src/Viewer/studio3d/studio3d.pro
|
|
+++ b/src/Viewer/studio3d/studio3d.pro
|
|
@@ -19,3 +19,7 @@ include(studio3d.pri)
|
|
load(qt_module)
|
|
|
|
OTHER_FILES += $$PWD/../../../doc/src/12-cpp-reference/*
|
|
+
|
|
+target.path = $$QT3DSTUDIO_PREFIX/lib
|
|
+dlltarget.path = $$QT3DSTUDIO_PREFIX/bin
|
|
+INSTALLS += target
|
|
--
|
|
2.15.0
|
|
|