aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qtwebkit.yaml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-301-2/+11
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-04-241-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update platform_configs for QtWebKitKonstantin Tokarev2020-03-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 64-bit MinGW config * Don't use DisableTests for 64-bit MinGW, as it's necessary for at least for the purpose of JS engine smoke check * Sync configure flags with qt5.yaml, but not enable forced debug info which causes build issues for both 32-bit and 64-bit configs Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Update MinGW 7.3.0 to Mingw 8.1.0Tony Sarajärvi2020-03-231-1/+4
| |/ | | | | | | | | | | | | | | Task-number: QTQAINFRA-3304 Change-Id: I4a962c112f4925224e91c08117c7324112d70729 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* / Use legacy instructions when building all qmake configurationsAlexandru Croitor2020-02-031-1/+1
|/ | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-08-201-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52. Conflicts: coin/platform_configs/default.yaml Temporarily remove the -no-opengl build. coin/platform_configs/meta-boot2qt.yaml coin/platform_configs/qt5.yaml Temporarily remove the webassembly build on windows. coin/platform_configs/qtwebkit.yaml Task-number: QTQAINFRA-2577 Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-With: Samuli Piippo <samuli.piippo@qt.io> Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
* Update platform_configs for QtWebKitKonstantin Tokarev2019-08-011-7/+1
| | | | | | | | | * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Change configuration files into yaml formatToni Saario2019-07-011-0/+11
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 13:30:41 +0000