b2febbf...
by
Liang Qi <email address hidden>
on 2019-09-13
Update submodules on 'wip/qt6' in qt5
Only qtmultimedia and qtwebengine in this round.
Change-Id: I82a7b1db76aa00 74cd42eeaea96e4 e0e4539a564
Reviewed-by: Simon Hausmann <email address hidden>
a2151b9...
by
Liang Qi <email address hidden>
on 2019-09-13
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
14d2852...
by
Liang Qi <email address hidden>
on 2019-09-13
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.gitmodules
Ignore qtquick3d for now.
coin/platform_ configs/ default. txt
coin/platform_ configs/ default. yaml
coin/platform_ configs/ qtbase. txt
coin/platform_ configs/ qtbase. yaml
We use yaml files for configurations now.
Adjust the configurations for Qt6 as it was
done before in the .txt files.
Done-With: Alexandru Croitor <email address hidden>
Change-Id: Ica164f8865aed0 11c550ba7e1e813 7e2bf9fdda9
1eae3c4...
by
Liang Qi <email address hidden>
on 2019-09-07
Update submodules on 'dev' in qt5
Change-Id: I87be62d19a3aee 1fae16cdf27fd35 ec67e30130d
Reviewed-by: Liang Qi <email address hidden>
8f87412...
by
Gatis
on 2019-08-25
platform_configs: replace -qt-xcb with -xcb
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.
Change-Id: I33d58b78a1d7f5 3d5941ebda7131b f35a71cc8e6
Reviewed-by: Simo Fält <email address hidden>
ff75bd5...
by
=?utf-8?q?Christian_Str=C3=B8mme?= <email address hidden>
on 2019-08-19
Add QtQuick3D as a submodule in qt5.git
Adds QtQuick3D as a preview module in dev
Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3 dac1acab9390121 cbd1ad6352a
Reviewed-by: Andy Nichols <email address hidden>
5f8a9b1...
by
Qt Submodule Update Bot <email address hidden>
on 2019-08-22
Update submodules on 'dev' in qt5
Change-Id: If400cccb49bb5d 470ba79077b2e9e 78e8410194d
Reviewed-by: Liang Qi <email address hidden>
9dd4451...
by
BogDan Vatra <email address hidden>
on 2019-08-20
Android: Update Android NDK to version r20
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29 754f259d71465ed c8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <email address hidden>
eb7370a...
by
Liang Qi <email address hidden>
on 2019-08-20
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
9a8fb86...
by
Liang Qi <email address hidden>
on 2019-08-20
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26df48c 9cf3b45fc15ebad 963fe34c52.
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 <email address hidden>
Change-Id: Ia7972b481a5ce3 3febe26c6589db2 4578614b2fd