From 7e0fe78315cde30f8431dfd121c6658817d26cae Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 3 May 2019 12:44:12 +0300 Subject: Add static build for Saferenderer Task-number: COIN-229 Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5 Reviewed-by: Tuomas Heimonen Reviewed-by: Aapo Keskimolo --- coin/platform_configs/qtsaferenderer.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index ec14f610..5158b45a 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,3 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples Static +qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static -- cgit v1.2.3 From 25349a29f7fc1d90fe0389e1ae90ee382d754d36 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 21 May 2019 09:59:12 +0300 Subject: Remove examples from Saferenderer static Windows build Task-number: QSR-458 Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9 Reviewed-by: Teemu Holappa --- coin/platform_configs/qtsaferenderer.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 5158b45a..837b331c 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples Static +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic Static qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static -- cgit v1.2.3 From 3cc1c40ff502ba5067fee21a9e3f7c7dc28f20a9 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 24 May 2019 16:26:50 +0300 Subject: Remove tests from Saferenderer static build Task-number: QSR-458 Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee Reviewed-by: Teemu Holappa --- coin/platform_configs/qtsaferenderer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 837b331c..86de1e45 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic Static -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker Static +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static -- cgit v1.2.3 From d49c0cd0bbc535156007a9772e4561d6aaf6a105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Feb 2019 14:51:55 +0200 Subject: Split features list between Coin and qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi (cherry picked from commit 8cdf60fe6492490561cd6798901b201903ff6ab2) --- coin/platform_configs/qtsaferenderer.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index 86de1e45..e27b1490 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic DisableTests Static +Template Target OS Target arch Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static -- cgit v1.2.3 From d77fdecc11054c6fb0c34824935fcbfcdf644734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 4 Jun 2019 11:10:57 +0300 Subject: Fix platform configuration files Typos, duplicate entries and one missing rebase ended up in the initial cherry-pick from 5.13 Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e Reviewed-by: Heikki Halmet --- coin/platform_configs/qtsaferenderer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index e27b1490..e05c4992 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features Configure arguments ----------------------------------- ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ -qtci-linux-RHEL-7.4-x86_64 GCC Release NoUseGoldLinker DisableTests Static +qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ +qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -- cgit v1.2.3 From 439a1eb2207417a6d2d0f14766e3e627035a9a7f Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Mon, 6 May 2019 15:10:32 +0300 Subject: Change configuration files into yaml format Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi Reviewed-by: Aapo Keskimolo --- coin/platform_configs/qtsaferenderer.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 coin/platform_configs/qtsaferenderer.txt (limited to 'coin/platform_configs/qtsaferenderer.txt') diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt deleted file mode 100644 index e05c4992..00000000 --- a/coin/platform_configs/qtsaferenderer.txt +++ /dev/null @@ -1,5 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ------------------------------------ ------------------- ----------- ----------- ------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-10 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++ -qtci-linux-RHEL-7.4-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -- cgit v1.2.3