aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/configurations/offline_installer_jobs
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@qt.io>2017-12-13 14:27:58 +0200
committerAntti Kokko <antti.kokko@qt.io>2017-12-18 12:55:36 +0000
commita84417d6ffd495f57a807434e7525cbca5d69f52 (patch)
treeea78aa80f0440822471c4d65ff5ee1438fd28973 /packaging-tools/configurations/offline_installer_jobs
parent2237f122ac7820e3e6795b60ef061e5ce075a1ac (diff)
Add missing GPL3 EXCEPT license for Qt3DStudio
Use the existing GPL3-EXCEPT packaging configuration for Qt3Dstudio offline and online installations. Task-numer: BOUL-968 Change-Id: I8e436e6582ce4c7b201e285655aea20b990a9ffd Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/configurations/offline_installer_jobs')
-rw-r--r--packaging-tools/configurations/offline_installer_jobs/qt3dstudio/mac_x641
-rw-r--r--packaging-tools/configurations/offline_installer_jobs/qt3dstudio/win_x86_64_msvc20151
2 files changed, 2 insertions, 0 deletions
diff --git a/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/mac_x64 b/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/mac_x64
index f091792b8..02250cb11 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/mac_x64
+++ b/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/mac_x64
@@ -35,6 +35,7 @@ identifier: mac
[PackageConfigurationFiles]
file_list: qt-conf,
qt-gplv3-license-conf,
+ qt-gpl3-except-license-conf,
tools-qt3dstudio-macOS-conf
[ConfigDir]
diff --git a/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/win_x86_64_msvc2015 b/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/win_x86_64_msvc2015
index 757f1024d..8f8bbd9f1 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/win_x86_64_msvc2015
+++ b/packaging-tools/configurations/offline_installer_jobs/qt3dstudio/win_x86_64_msvc2015
@@ -35,6 +35,7 @@ identifier: windows
[PackageConfigurationFiles]
file_list: qt-conf,
qt-gplv3-license-conf,
+ qt-gpl3-except-license-conf,
x86-tools-qt3dstudio-conf,
x86-tools-vcredist_msvc2015-conf,
x64-tools-vcredist_msvc2015-conf