Liang Qi
54c94ae681
Merge remote-tracking branch 'origin/5.15' into dev
...
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Liang Qi
cc4fdea014
Merge remote-tracking branch 'origin/5.14' into 5.15
...
Conflicts:
.gitmodules
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsdk.yaml
coin/platform_configs/tqtc-qt-rta.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
2020-04-24 15:31:01 +02:00
Heikki Halmet
704e5d5635
Update Windows 10 x86 to version 1909
...
These are also updated to tier1 image:
msvc 2017: 15.9.21
msvc 2017 build tools: 15.0 (26228.10)
msvc 2019: 16.4.6
msvc 2019 build tools: 16.4.6
Change-Id: I41ae0e287ccf74183438d7a7bff639fd78e86e7a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2020-03-26 11:37:38 +02:00
Liang Qi
08e63423e2
Merge remote-tracking branch 'origin/5.15' into dev
...
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/flashing-wizard.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/tqtc-qt-config-gui.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
2020-02-28 13:49:10 +01:00
Heikki Halmet
97aa53410e
Add MSVC 2019 as packaging target and remove msvc2017 verification
...
Change will enable tests for MSVC 2019 and replace MSVC2017 as packaging
target.
Task-number: QTQAINFRA-2875
Task-number: QTQAINFRA-3432
Change-Id: Ifef3bd02b5fae6225a6c0ecdc412edbb488e25b1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io >
2020-02-27 20:06:22 +02:00
Alexandru Croitor
25e0073720
Use legacy instructions when building all qmake configurations
...
This change is preparation for merging qtbase wip/cmake -> dev,
because that will bring in the new yaml instructions on how
to build the CMake configurations, which means that legacy
instructions provided by Coin itself need to be used for all
the existing qmake configurations.
Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io >
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org >
2020-02-03 14:15:33 +01:00
Matti Paaso
f178318d2f
Add new target for installer framework
...
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io >
2019-11-04 14:46:22 +02:00
Toni Saario
439a1eb220
Change configuration files into yaml format
...
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io >
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
2019-07-01 10:28:29 +02:00
